aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrobinsch <robin.schriever.hude@web.de>2015-07-01 17:35:34 +0200
committerDDuarte <dnpd.dd@gmail.com>2015-07-03 01:13:24 +0100
commitaac7374a0925fc1c8a4cf83c7a3ac6105305ba77 (patch)
tree24277b1041dee144b5e0d63d2aa77ca3717df31d /src
parent878548d94c9237c45dc7c4f835e7c5eea8f83cc1 (diff)
Core/Unit: Fix issue with Divine Shield immunities
Closes #14910 (cherry picked from commit 2263cb9e1015ed0f6dbf83b63d8f0332bcbe6205) Conflicts: src/server/game/Entities/Unit/Unit.cpp
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 15ae5f9cdba..74056219a7e 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -1741,6 +1741,14 @@ void Unit::CalcAbsorbResist(Unit* victim, SpellSchoolMask schoolMask, DamageEffe
splitDamage = RoundToInterval(splitDamage, uint32(0), uint32(dmgInfo.GetDamage()));
dmgInfo.AbsorbDamage(splitDamage);
+
+ // check if caster is immune to damage
+ if (caster->IsImmunedToDamage(schoolMask))
+ {
+ victim->SendSpellMiss(caster, (*itr)->GetSpellInfo()->Id, SPELL_MISS_IMMUNE);
+ continue;
+ }
+
uint32 split_absorb = 0;
DealDamageMods(caster, splitDamage, &split_absorb);