From e83aa1ba9dadfa7ce3189444d66f56e872495a76 Mon Sep 17 00:00:00 2001 From: Laise Date: Wed, 5 May 2010 06:57:18 +0300 Subject: [PATCH] [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) --- src/game/SpellEffects.cpp | 6 ++---- src/game/Unit.cpp | 2 -- src/shared/revision_nr.h | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 94737f7ba..a9dcbe877 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -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)) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 59c431657..dea115b8f 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -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; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index e4933d1d9..f0bfbe5b5 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9836" + #define REVISION_NR "9837" #endif // __REVISION_NR_H__