From d81f5facc0df7a2673122e170f28fe7b91fe4c50 Mon Sep 17 00:00:00 2001 From: QAston Date: Sun, 29 Aug 2010 05:26:32 +0200 Subject: [PATCH] *Allow SPELL_EFFECT_POWER_BURN(64) to proc with damage. --HG-- branch : trunk --- src/server/game/Entities/Unit/Unit.cpp | 2 +- src/server/game/Spells/SpellEffects.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 3593e1f799..96a8e79869 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -1514,7 +1514,7 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss) data << uint64(GetGUID()); data << uint32(i_spellProto->Id); data << uint32(damage); // Damage - int32 overkill = damage - GetHealth(); + int32 overkill = int32(damage) - int32(GetHealth()); data << uint32(overkill > 0 ? overkill : 0); // Overkill data << uint32(i_spellProto->SchoolMask); pVictim->SendMessageToSet(&data, true); diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index c022309c85..986f53dfaf 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -2425,8 +2425,7 @@ void Spell::EffectPowerBurn(SpellEffIndex effIndex) ExecuteLogEffectTakeTargetPower(effIndex, unitTarget, powerType, newDamage, dmgMultiplier); - if (m_originalCaster) - m_originalCaster->DealDamage(unitTarget, newDamage); + m_damage += newDamage; } void Spell::EffectHeal(SpellEffIndex /*effIndex*/)