aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2016-11-19 20:17:17 -0300
committerariel- <ariel-@users.noreply.github.com>2016-11-19 20:17:17 -0300
commitc5d1b4656971f5a9cbe37e082ba817a133917cc1 (patch)
tree0b55564413c6f0e2bdf4a08d43803728f522be3f /src
parent9b00fd8d7bebacb5ab113c0a24a65ccfbb25ad25 (diff)
Core/Unit: do not allow judgement spells to bypass damage immunity
3f19eea5e41fd47b571c17529e08d9f8caa91705 follow-up. Without the #16658 regression
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp3
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 c4e879c08d9..46bb247a6e8 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -7885,7 +7885,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))