diff options
author | Nay <dnpd.dd@gmail.com> | 2012-09-09 02:26:31 +0100 |
---|---|---|
committer | Nay <dnpd.dd@gmail.com> | 2012-09-09 02:26:31 +0100 |
commit | 50327363ca764347b508d7b5e736db631f2be45c (patch) | |
tree | 076f22d7da5a5fe4c330af588b221170dae88366 /src/server/game/Spells/SpellInfo.cpp | |
parent | 6c1bdb3d3c319e999bfbf3c3a16701569ce04d22 (diff) | |
parent | d04f155b6529e3d86fca931075775fd34b544e29 (diff) |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'src/server/game/Spells/SpellInfo.cpp')
-rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index d37ff1465bd..1141517bfe8 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -1127,10 +1127,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; |