diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Spell.cpp | 5 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 6 |
2 files changed, 3 insertions, 8 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); 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; |