diff options
| author | Sebastian Valle Herrera <subv2112@gmail.com> | 2014-06-07 14:23:41 -0500 |
|---|---|---|
| committer | Sebastian Valle Herrera <subv2112@gmail.com> | 2014-06-07 14:23:41 -0500 |
| commit | 121083e59dc4e49ba2013aa077b7e27563e0eeb5 (patch) | |
| tree | c15f5e4b0dc8bfa6074d9278c398b4186c2e8286 /src | |
| parent | 1b3149b07f3c3b7bd09a2ae7cd207fb3e4c1dbbf (diff) | |
| parent | 97046283b56cc6042332a20ff9405e0e7a6f81f5 (diff) | |
Merge pull request #12232 from Trisjdc/anti_magic_shell
Core/Spells: Anti-Magic shell should give immunity to all spells that belong to SPELL_SCHOOL_MASK_MAGIC regardless of dispel type
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 4efa1374ec7..7721aec151b 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -11111,8 +11111,7 @@ bool Unit::IsImmunedToSpellEffect(SpellInfo const* spellInfo, uint32 index) cons // Check for immune to application of harmful magical effects AuraEffectList const& immuneAuraApply = GetAuraEffectsByType(SPELL_AURA_MOD_IMMUNE_AURA_APPLY_SCHOOL); for (AuraEffectList::const_iterator iter = immuneAuraApply.begin(); iter != immuneAuraApply.end(); ++iter) - if (spellInfo->Dispel == DISPEL_MAGIC && // Magic debuff - ((*iter)->GetMiscValue() & spellInfo->GetSchoolMask()) && // Check school + if (((*iter)->GetMiscValue() & spellInfo->GetSchoolMask()) && // Check school !spellInfo->IsPositiveEffect(index)) // Harmful return true; } |