aboutsummaryrefslogtreecommitdiff
path: root/src/game/SpellAuras.cpp
diff options
context:
space:
mode:
authorQAston <none@none>2009-04-19 14:44:16 +0200
committerQAston <none@none>2009-04-19 14:44:16 +0200
commit568879e10967c984a39c9b7a37be55e0ffa4a00b (patch)
tree3536ea7eb9c7339825ee7e56704a4aba7605b261 /src/game/SpellAuras.cpp
parent6e27a4c455633851c381d8ded602325c6c888ff9 (diff)
*Send overheal amount to client.
*Fix potion cooldowns. --HG-- branch : trunk
Diffstat (limited to 'src/game/SpellAuras.cpp')
-rw-r--r--src/game/SpellAuras.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 37c4600feaf..04521881744 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -1150,7 +1150,7 @@ void Aura::_RemoveAura()
if(*itr < 0)
m_target->RemoveAurasDueToSpell(-(*itr));
else if(Unit* caster = GetCaster())
- if (m_removeMode==AURA_REMOVE_BY_EXPIRE)
+ if (m_removeMode!=AURA_REMOVE_BY_DEFAULT)
m_target->CastSpell(m_target, *itr, true, 0, 0, caster->GetGUID());
}
}
@@ -1631,8 +1631,8 @@ void AuraEffect::TriggerSpell()
case 23493:
{
int32 heal = caster->GetMaxHealth() / 10;
- caster->ModifyHealth( heal );
- caster->SendHealSpellLog(caster, 23493, heal);
+ int32 gain = caster->ModifyHealth( heal );
+ caster->SendHealSpellLog(caster, 23493, heal, false, &gain);
int32 mana = caster->GetMaxPower(POWER_MANA);
if (mana)
@@ -5854,7 +5854,7 @@ void AuraEffect::PeriodicTick()
int32 gain = pCaster->ModifyHealth(heal);
pCaster->getHostilRefManager().threatAssist(pCaster, gain * 0.5f, spellProto);
- pCaster->SendHealSpellLog(pCaster, spellProto->Id, heal);
+ pCaster->SendHealSpellLog(pCaster, spellProto->Id, heal,false, &gain);
break;
}
case SPELL_AURA_PERIODIC_HEAL: