Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts: sql/base/characters_database.sql src/server/game/Entities/Player/Player.cpp src/server/game/Handlers/CharacterHandler.cpp
This commit is contained in:
commit
7c4e7a9ebc
20 files changed
+149
-39
No files matched your search
@@ -1237,10 +1237,6 @@ bool SpellInfo::CanPierceImmuneAura(SpellInfo const* aura) const
|
||||
|
||||
bool SpellInfo::CanDispelAura(SpellInfo const* aura) const
|
||||
{
|
||||
// These auras (like ressurection sickness) can't be dispelled
|
||||
if (aura->Attributes & SPELL_ATTR0_NEGATIVE_1)
|
||||
return false;
|
||||
|
||||
// These spells (like Mass Dispel) can dispell all auras
|
||||
if (Attributes & SPELL_ATTR0_UNAFFECTED_BY_INVULNERABILITY)
|
||||
return true;
|
||||
|
||||
Reference in new issue
Block a user