diff options
| author | QAston <none@none> | 2009-03-17 00:28:22 +0100 |
|---|---|---|
| committer | QAston <none@none> | 2009-03-17 00:28:22 +0100 |
| commit | 0cb08705b9264563eb8252cc4f848b77bdef437f (patch) | |
| tree | f8a6c262c40b61a2ae95d0cb50ad885eafb3bad8 /src/game/Unit.cpp | |
| parent | 950afd25443615c4cb309278dcc78479642d240e (diff) | |
*Revert Damage Shield fix.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 43cd1d642ce..e8e8435ac1a 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -2376,9 +2376,7 @@ void Unit::AttackerStateUpdate (Unit *pVictim, WeaponAttackType attType, bool ex CalculateMeleeDamage(pVictim, 0, &damageInfo, attType); // Send log damage message to client SendAttackStateUpdate(&damageInfo); - // Send blocked amount to spell_proc event if proc can be only from block (Damage Shield) - uint32 ProcAmount = damageInfo.procEx == PROC_EX_BLOCK ? damageInfo.blocked_amount : damageInfo.damage; - ProcDamageAndSpell(damageInfo.target, damageInfo.procAttacker, damageInfo.procVictim, damageInfo.procEx, ProcAmount, damageInfo.attackType); + ProcDamageAndSpell(damageInfo.target, damageInfo.procAttacker, damageInfo.procVictim, damageInfo.procEx, damageInfo.damage, damageInfo.attackType); DealMeleeDamage(&damageInfo,true); if (GetTypeId() == TYPEID_PLAYER) @@ -5553,7 +5551,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu { triggered_spell_id = 59653; // % of amount blocked - basepoints0 = damage * triggerAmount / 100; + basepoints0 = GetShieldBlockValue() * triggerAmount / 100; break; } break; |