[9837] Remove calls to Taken part when its not used for damage dealing and fix HoT tick amount used in 18562 code(Thanks to insider42)

This commit is contained in:
Laise 2010-05-05 06:57:18 +03:00
parent 6dec6c8a9f
commit e83aa1ba9d
3 changed files with 3 additions and 7 deletions

View file

@ -3110,10 +3110,8 @@ void Spell::EffectHeal(SpellEffectIndex /*eff_idx*/)
idx++;
}
int32 tickheal = caster->SpellHealingBonusDone(unitTarget, targetAura->GetSpellProto(), targetAura->GetModifier()->m_amount, DOT);
tickheal = unitTarget->SpellHealingBonusTaken(caster, targetAura->GetSpellProto(), tickheal, DOT);
int32 tickcount = GetSpellDuration(targetAura->GetSpellProto()) / targetAura->GetSpellProto()->EffectAmplitude[idx];
int32 tickheal = targetAura->GetModifier()->m_amount;
int32 tickcount = GetSpellDuration(targetAura->GetSpellProto()) / targetAura->GetSpellProto()->EffectAmplitude[idx] - 1;
// Glyph of Swiftmend
if (!caster->HasAura(54824))

View file

@ -5884,7 +5884,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
return false;
int32 healingfromticks = healingAura->GetModifier()->m_amount * GetSpellAuraMaxTicks(procSpell);
healingfromticks = pVictim->SpellHealingBonusTaken(this, procSpell, healingfromticks, DOT);
basepoints[0] = healingfromticks * triggerAmount / 100;
triggered_spell_id = 63544;
@ -5901,7 +5900,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
return false;
int32 damagefromticks = leachAura->GetModifier()->m_amount * GetSpellAuraMaxTicks(procSpell);
damagefromticks = pVictim->SpellDamageBonusTaken(this, procSpell, damagefromticks, DOT);
basepoints[0] = damagefromticks * triggerAmount / 100;
triggered_spell_id = 63675;
break;

View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "9836"
#define REVISION_NR "9837"
#endif // __REVISION_NR_H__