diff options
| author | kandera <kanderadev@gmail.com> | 2012-09-27 09:35:08 -0700 |
|---|---|---|
| committer | kandera <kanderadev@gmail.com> | 2012-09-27 09:35:08 -0700 |
| commit | 8408c52c408ac7c39fd9dcf694040e4b8345c708 (patch) | |
| tree | 89e3661ccafc20c9c3008b5771f02655144c9d08 /src | |
| parent | 8fc42b16ecfe611e4fb6a884a2e6bccd5ce80e6e (diff) | |
| parent | 3fae05f6f36bdfd9ebc840eec3a1b07114c30c86 (diff) | |
Merge pull request #7883 from tibbi/shield_generator
correct hit result if the spell has SPELL_ATTR3_IGNORE_HIT_RESULT
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index fb6f2678e58..3e9ab113918 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -11579,7 +11579,9 @@ bool Unit::IsImmunedToSpellEffect(SpellInfo const* spellInfo, uint32 index) cons SpellImmuneList const& list = m_spellImmune[IMMUNITY_STATE]; for (SpellImmuneList::const_iterator itr = list.begin(); itr != list.end(); ++itr) if (itr->type == aura) - return true; + if (!(spellInfo->AttributesEx3 & SPELL_ATTR3_IGNORE_HIT_RESULT)) + return true; + // 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) |