From 568879e10967c984a39c9b7a37be55e0ffa4a00b Mon Sep 17 00:00:00 2001 From: QAston Date: Sun, 19 Apr 2009 14:44:16 +0200 Subject: *Send overheal amount to client. *Fix potion cooldowns. --HG-- branch : trunk --- src/game/Spell.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/game/Spell.cpp') diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 1f31c3d2d88..8b0014caaae 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -2681,8 +2681,8 @@ void Spell::finish(bool ok) // Heal caster for all health leech from all targets if (m_healthLeech) { - m_caster->ModifyHealth(m_healthLeech); - m_caster->SendHealSpellLog(m_caster, m_spellInfo->Id, uint32(m_healthLeech)); + int32 gain = m_caster->ModifyHealth(m_healthLeech); + m_caster->SendHealSpellLog(m_caster, m_spellInfo->Id, uint32(m_healthLeech), false, &gain); } if (IsMeleeAttackResetSpell()) @@ -2695,7 +2695,7 @@ void Spell::finish(bool ok) } // potions disabled by client, send event "not in combat" if need - if (m_caster->GetTypeId() == TYPEID_PLAYER) + if (!m_triggeredByAuraSpell && m_caster->GetTypeId() == TYPEID_PLAYER) ((Player*)m_caster)->UpdatePotionCooldown(this); // call triggered spell only at successful cast (after clear combo points -> for add some if need) -- cgit v1.2.3