*Fix dead-loop crash.

*Fix damage shield.

--HG--
branch : trunk

1 files changed, 4 insertions, 1 deletions

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 57bcebcef62..db2b357fc39 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -997,9 +997,12 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
         procEx = createProcExtendMask(&damageInfo, missInfo);
         procVictim |= PROC_FLAG_TAKEN_ANY_DAMAGE;
 
+        // Send blocked amount to spell_proc event if proc can be only from block (Damage Shield)
+        uint32 ProcAmount = procEx == PROC_EX_BLOCK ? damageInfo.blocked : damageInfo.damage;
+
         // Do triggers for unit (reflect triggers passed on hit phase for correct drop charge)
         if (m_canTrigger && missInfo != SPELL_MISS_REFLECT)
-            caster->ProcDamageAndSpell(unitTarget, procAttacker, procVictim, procEx, damageInfo.damage, m_attackType, m_spellInfo);
+            caster->ProcDamageAndSpell(unitTarget, procAttacker, procVictim, procEx, ProcAmount, m_attackType, m_spellInfo);
 
         caster->DealSpellDamage(&damageInfo, true);