diff options
| author | Jeremy <Golrag@users.noreply.github.com> | 2025-06-06 19:24:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-06 19:24:12 +0200 |
| commit | f25ca4165e720ece61a44b1c734ce53cfe31367b (patch) | |
| tree | 46c9f45a50a9ef86b677535f1ebeb98798acfa33 /src | |
| parent | 7c20119733a5b4f3b5454b4511a8d46840492324 (diff) | |
Script/Spells: Fix warrior mortal strike (#31029)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/Spells/spell_warrior.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index fcdb4adf218..1564a5efe30 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -56,7 +56,7 @@ enum WarriorSpells SPELL_WARRIOR_IMPENDING_VICTORY_HEAL = 202166, SPELL_WARRIOR_IMPROVED_HEROIC_LEAP = 157449, SPELL_WARRIOR_MORTAL_STRIKE = 12294, - SPELL_WARRIOR_MORTAL_WOUNDS = 213667, + SPELL_WARRIOR_MORTAL_WOUNDS = 115804, SPELL_WARRIOR_RALLYING_CRY = 97463, SPELL_WARRIOR_RUMBLING_EARTH = 275339, SPELL_WARRIOR_SHIELD_BLOCK_AURA = 132404, @@ -526,7 +526,7 @@ class spell_warr_item_t10_prot_4p_bonus : public AuraScript } }; -// 12294 - Mortal Strike 7.1.5 +// 12294 - Mortal Strike class spell_warr_mortal_strike : public SpellScript { bool Validate(SpellInfo const* /*spellInfo*/) override @@ -534,15 +534,17 @@ class spell_warr_mortal_strike : public SpellScript return ValidateSpellInfo({ SPELL_WARRIOR_MORTAL_WOUNDS }); } - void HandleDummy(SpellEffIndex /*effIndex*/) + void HandleMortalWounds(SpellEffIndex /*effIndex*/) const { - if (Unit* target = GetHitUnit()) - GetCaster()->CastSpell(target, SPELL_WARRIOR_MORTAL_WOUNDS, true); + GetCaster()->CastSpell(GetHitUnit(), SPELL_WARRIOR_MORTAL_WOUNDS, CastSpellExtraArgsInit{ + .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR, + .TriggeringSpell = GetSpell() + }); } void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_warr_mortal_strike::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget += SpellEffectFn(spell_warr_mortal_strike::HandleMortalWounds, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; |