diff options
author | Shauren <shauren.trinity@gmail.com> | 2015-08-08 15:15:14 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2015-08-08 15:15:14 +0200 |
commit | fcc8c2d12c775d51b56b280e6684f8d60d798c07 (patch) | |
tree | 1b6db969dcc257b7ca0dda6c1633e48996a93629 /src/server/game/Spells/Spell.cpp | |
parent | c9e138d66d6a455a72d3fefbc0e4d5998bc338d6 (diff) |
Core/PacketIO: Implemented advanced combat logging
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
-rw-r--r-- | src/server/game/Spells/Spell.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index c1886bc92bc..26da12b1840 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -2417,9 +2417,6 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target) caster->CalculateSpellDamageTaken(&damageInfo, m_damage, m_spellInfo, m_attackType, target->crit); caster->DealDamageMods(damageInfo.target, damageInfo.damage, &damageInfo.absorb); - // Send log damage message to client - caster->SendSpellNonMeleeDamageLog(&damageInfo); - procEx |= createProcExtendMask(&damageInfo, missInfo); procVictim |= PROC_FLAG_TAKEN_DAMAGE; @@ -2434,7 +2431,10 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target) m_damage = damageInfo.damage; - caster->DealSpellDamage(&damageInfo, true); + damageInfo.damage = caster->DealSpellDamage(&damageInfo, true); + + // Send log damage message to client + caster->SendSpellNonMeleeDamageLog(&damageInfo); } // Passive spell hits/misses or active spells only misses (only triggers) else |