From c7e27dd5114d55835d0cd4db7af24b084f692769 Mon Sep 17 00:00:00 2001 From: ariel- Date: Sat, 19 Nov 2016 20:17:17 -0300 Subject: [PATCH] Core/Unit: do not allow judgement spells to bypass damage immunity 3f19eea5e41fd47b571c17529e08d9f8caa91705 follow-up. Without the #16658 regression --- src/server/game/Entities/Unit/Unit.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 9a08cab18e..022dc7b79e 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -7671,7 +7671,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))