aboutsummaryrefslogtreecommitdiff
path: root/src/game/Spell.cpp
diff options
context:
space:
mode:
authorQAston <none@none>2009-03-17 00:28:22 +0100
committerQAston <none@none>2009-03-17 00:28:22 +0100
commit0cb08705b9264563eb8252cc4f848b77bdef437f (patch)
treef8a6c262c40b61a2ae95d0cb50ad885eafb3bad8 /src/game/Spell.cpp
parent950afd25443615c4cb309278dcc78479642d240e (diff)
*Revert Damage Shield fix.
--HG-- branch : trunk
Diffstat (limited to 'src/game/Spell.cpp')
-rw-r--r--src/game/Spell.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index db2b357fc39..57bcebcef62 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -997,12 +997,9 @@ 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, ProcAmount, m_attackType, m_spellInfo);
+ caster->ProcDamageAndSpell(unitTarget, procAttacker, procVictim, procEx, damageInfo.damage, m_attackType, m_spellInfo);
caster->DealSpellDamage(&damageInfo, true);