Core/Spells: Correct tick damage for health funnel. (thx alp22) Closes #3465

This commit is contained in:
Kandera
2012-04-24 13:39:37 -04:00
parent 2e9196162e
commit e6a6f6539d
@@ -1616,7 +1616,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const
{ {
// Use the new aura to see on what stance the target will be // Use the new aura to see on what stance the target will be
uint32 newStance = (1<<((newAura ? newAura->GetMiscValue() : 0)-1)); uint32 newStance = (1<<((newAura ? newAura->GetMiscValue() : 0)-1));
// If the stances are not compatible with the spell, remove it // If the stances are not compatible with the spell, remove it
if (itr->second->GetBase()->IsRemovedOnShapeLost(target) && !(itr->second->GetBase()->GetSpellInfo()->Stances & newStance)) if (itr->second->GetBase()->IsRemovedOnShapeLost(target) && !(itr->second->GetBase()->GetSpellInfo()->Stances & newStance))
target->RemoveAura(itr); target->RemoveAura(itr);
@@ -6473,7 +6473,7 @@ void AuraEffect::HandlePeriodicHealAurasTick(Unit* target, Unit* caster) const
// damage caster for heal amount // damage caster for heal amount
if (target != caster && GetSpellInfo()->AttributesEx2 & SPELL_ATTR2_HEALTH_FUNNEL) if (target != caster && GetSpellInfo()->AttributesEx2 & SPELL_ATTR2_HEALTH_FUNNEL)
{ {
uint32 funnelDamage = GetSpellInfo()->Effects[EFFECT_0].CalcValue(); // damage is not affected by spell power uint32 funnelDamage = GetSpellInfo()->ManaPerSecond; // damage is not affected by spell power
if ((int32)funnelDamage > gain) if ((int32)funnelDamage > gain)
funnelDamage = gain; funnelDamage = gain;
uint32 funnelAbsorb = 0; uint32 funnelAbsorb = 0;