diff options
| author | QAston <none@none> | 2010-08-29 05:26:32 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2010-08-29 05:26:32 +0200 |
| commit | d81f5facc0df7a2673122e170f28fe7b91fe4c50 (patch) | |
| tree | 0d74d9bd0d19859c0278816bff5ca44e38cf3154 /src | |
| parent | f81dcf55bb0aef9e23f30f152b9d560ceb68ccb0 (diff) | |
*Allow SPELL_EFFECT_POWER_BURN(64) to proc with damage.
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 2 | ||||
| -rw-r--r-- | 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 3593e1f7996..96a8e798696 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 c022309c85a..986f53dfaff 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*/) |