diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp index d33378c6624..e75a758d0a3 100644 --- a/src/server/game/Spells/SpellScript.cpp +++ b/src/server/game/Spells/SpellScript.cpp @@ -555,16 +555,6 @@ void SpellScript::SetHitDamage(int32 damage) m_spell->m_damage = damage; } -void SpellScript::SetEffectDamage(int32 damage) -{ - if (!IsInTargetHook()) - { - TC_LOG_ERROR("scripts", "Script: `%s` Spell: `%u`: function SpellScript::SetHitDamage was called, but function has no effect in current hook!", m_scriptName->c_str(), m_scriptSpellId); - return; - } - m_spell->damage = damage; -} - int32 SpellScript::GetHitHeal() const { if (!IsInTargetHook()) diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h index 42e72d84170..ada9008551c 100644 --- a/src/server/game/Spells/SpellScript.h +++ b/src/server/game/Spells/SpellScript.h @@ -427,7 +427,6 @@ class TC_GAME_API SpellScript : public _SpellScript int32 GetHitDamage() const; void SetHitDamage(int32 damage); void PreventHitDamage() { SetHitDamage(0); } - void SetEffectDamage(int32 damage); // setter/getter for for heal done by spell to target of spell hit // returns healing calculated before hit, and real dmg done after hit int32 GetHitHeal() const; diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 574c1f19b38..170dab65639 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -963,7 +963,7 @@ class spell_warr_victory_rush : public SpellScript if (Player* modOwner = caster->GetSpellModOwner()) modOwner->ApplySpellMod(m_scriptSpellId, SPELLMOD_EFFECT3, damage); - SetEffectDamage(damage); + SetEffectValue(damage); } caster->RemoveAurasDueToSpell(SPELL_WARRIOR_VICTORIOUS);