aboutsummaryrefslogtreecommitdiff
path: root/src/game/SpellEffects.cpp
diff options
context:
space:
mode:
authorQAston <none@none>2009-05-19 20:33:11 +0200
committerQAston <none@none>2009-05-19 20:33:11 +0200
commite348b671e7cbe8ce328a4bf07c635328a4accb3c (patch)
tree669e62463079ba5af3826a50300f77bd7d0ca649 /src/game/SpellEffects.cpp
parent2b47f0c0f7756b89384a3c6969a8a133b3a18ee8 (diff)
*Corret proc from bloodsurge and judgements of the wise
*Do not proc backfire dmg from sw:death if target is killed *Allow hots to proc from selfcast *Fix glyph of corruption. --HG-- branch : trunk
Diffstat (limited to 'src/game/SpellEffects.cpp')
-rw-r--r--src/game/SpellEffects.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 09807fe6cd0..3d1cdbf595b 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -471,7 +471,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
case SPELLFAMILY_PRIEST:
{
// Shadow Word: Death - deals damage equal to damage done to caster
- if (m_spellInfo->SpellFamilyFlags[1] & 0x2)
+ if ((m_spellInfo->SpellFamilyFlags[1] & 0x2 )&& m_damage < unitTarget->GetHealth())
m_caster->CastCustomSpell(m_caster, 32409, &damage, 0, 0, true);
break;
}
@@ -1489,7 +1489,7 @@ void Spell::EffectDummy(uint32 i)
// Penance
if (m_spellInfo->SpellFamilyFlags[1] & 0x00800000)
{
- if (!unitTarget)
+ if (!unitTarget || !unitTarget->isAlive())
return;
int hurt = 0;