diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2016-11-19 20:17:17 -0300 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2018-01-21 15:15:35 +0100 |
| commit | d9f74278f76d62738ec6a6e8a2b8a98c05cf76af (patch) | |
| tree | 5e2811266c8b94ac9c6bc70d8ecc7eba63207212 | |
| parent | 97980f4e0a23f8fa130d98714e355fe52861fbcf (diff) | |
Core/Unit: do not allow judgement spells to bypass damage immunity
3f19eea5e41fd47b571c17529e08d9f8caa91705 follow-up. Without the #16658 regression
(cherry picked from commit c5d1b4656971f5a9cbe37e082ba817a133917cc1)
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index f80966aeaf1..3af131af679 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -7177,7 +7177,8 @@ bool Unit::IsImmunedToDamage(SpellInfo const* spellInfo) const if (!spellInfo) return false; - if (spellInfo->HasAttribute(SPELL_ATTR3_IGNORE_HIT_RESULT)) + // for example 40175 + if (spellInfo->HasAttribute(SPELL_ATTR0_UNAFFECTED_BY_INVULNERABILITY) && spellInfo->HasAttribute(SPELL_ATTR3_IGNORE_HIT_RESULT)) return false; if (spellInfo->HasAttribute(SPELL_ATTR1_UNAFFECTED_BY_SCHOOL_IMMUNE) || spellInfo->HasAttribute(SPELL_ATTR2_UNAFFECTED_BY_AURA_SCHOOL_IMMUNE)) |