diff options
| author | Keader <keader.android@gmail.com> | 2017-10-07 18:38:11 -0300 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-12-31 23:23:50 +0100 |
| commit | 5a82598f03140cbfb288e1848efc983cf5d1f8cb (patch) | |
| tree | 981144876944cc08d3584c49c634dba9346a838f /src | |
| parent | e7acc770ba0a4321ae51c1a688cac0a674f428a9 (diff) | |
Core/Spells: Fixed issues with School Immune vs SPELL_ATTR1_UNAFFECTED_BY_SCHOOL_IMMUNE (#20546)
(cherry picked from commit 98c363154ad6906fb9cfaeb2ac13b77c8540c73d)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index aacd3be1a81..b13a3ad209c 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -1743,7 +1743,8 @@ bool SpellInfo::CanDispelAura(SpellInfo const* auraSpellInfo) const return true; // These auras (Cyclone for example) are not dispelable - if (auraSpellInfo->HasAttribute(SPELL_ATTR1_UNAFFECTED_BY_SCHOOL_IMMUNE) || auraSpellInfo->HasAttribute(SPELL_ATTR2_UNAFFECTED_BY_AURA_SCHOOL_IMMUNE)) + if ((auraSpellInfo->HasAttribute(SPELL_ATTR1_UNAFFECTED_BY_SCHOOL_IMMUNE) && auraSpellInfo->Mechanic != MECHANIC_NONE) + || auraSpellInfo->HasAttribute(SPELL_ATTR2_UNAFFECTED_BY_AURA_SCHOOL_IMMUNE)) return false; return true; |