From 65276ba69a8058ca3e077ac23f86baab005cb53e Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sun, 15 Jun 2025 10:02:54 +0200 Subject: Scripts/Spells: Fix warrior bloodthirst heal (#31027) --- src/server/scripts/Spells/spell_warrior.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 2f82cb3fb93..7e91e4381e3 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -106,6 +106,7 @@ class spell_warr_avatar : public SpellScript }; // 23881 - Bloodthirst +// 335096 - Bloodbath class spell_warr_bloodthirst : public SpellScript { bool Validate(SpellInfo const* /*spellInfo*/) override @@ -113,14 +114,21 @@ class spell_warr_bloodthirst : public SpellScript return ValidateSpellInfo({ SPELL_WARRIOR_BLOODTHIRST_HEAL }); } - void HandleDummy(SpellEffIndex /*effIndex*/) + void CastHeal(SpellEffIndex /*effIndex*/) const { - GetCaster()->CastSpell(GetCaster(), SPELL_WARRIOR_BLOODTHIRST_HEAL, true); + if (GetHitUnit() != GetExplTargetUnit()) + return; + + GetCaster()->CastSpell(GetCaster(), SPELL_WARRIOR_BLOODTHIRST_HEAL, CastSpellExtraArgsInit + { + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR, + .TriggeringSpell = GetSpell() + }); } void Register() override { - OnEffectHit += SpellEffectFn(spell_warr_bloodthirst::HandleDummy, EFFECT_3, SPELL_EFFECT_DUMMY); + OnEffectHitTarget += SpellEffectFn(spell_warr_bloodthirst::CastHeal, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; -- cgit v1.2.3