From e348b671e7cbe8ce328a4bf07c635328a4accb3c Mon Sep 17 00:00:00 2001
From: QAston <none@none>
Date: Tue, 19 May 2009 20:33:11 +0200
Subject: *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
---
 src/game/SpellEffects.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/game/SpellEffects.cpp')

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;
-- 
cgit v1.2.3