From 6945058ad972faf9b4517c5d2354b1a475c10848 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sat, 14 Feb 2026 22:58:33 +0100 Subject: [PATCH] Scripts/Spells: Rename script for Improved Whirlwind to match other warrior spells (#31683) --- sql/updates/world/master/2026_02_14_03_world.sql | 1 + src/server/scripts/Spells/spell_warrior.cpp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 sql/updates/world/master/2026_02_14_03_world.sql diff --git a/sql/updates/world/master/2026_02_14_03_world.sql b/sql/updates/world/master/2026_02_14_03_world.sql new file mode 100644 index 0000000000..df2e4086a7 --- /dev/null +++ b/sql/updates/world/master/2026_02_14_03_world.sql @@ -0,0 +1 @@ +UPDATE `spell_script_names` SET `ScriptName` = 'spell_warr_improved_whirlwind' WHERE `ScriptName` = 'spell_improved_whirlwind'; diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 56b235820a..4a629a6a93 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -1023,7 +1023,7 @@ class spell_warr_impending_victory : public SpellScript }; // 12950 - Improved Whirlwind (attached to 190411 - Whirlwind) -class spell_improved_whirlwind : public SpellScript +class spell_warr_improved_whirlwind : public SpellScript { bool Validate(SpellInfo const* spellInfo) override { @@ -1062,7 +1062,7 @@ class spell_improved_whirlwind : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_improved_whirlwind::HandleHit, EFFECT_1, SPELL_EFFECT_DUMMY); + OnEffectHitTarget += SpellEffectFn(spell_warr_improved_whirlwind::HandleHit, EFFECT_1, SPELL_EFFECT_DUMMY); } }; @@ -1854,7 +1854,7 @@ void AddSC_warrior_spell_scripts() RegisterSpellScript(spell_warr_heroic_leap); RegisterSpellScript(spell_warr_heroic_leap_damage); RegisterSpellScript(spell_warr_impending_victory); - RegisterSpellScript(spell_improved_whirlwind); + RegisterSpellScript(spell_warr_improved_whirlwind); RegisterSpellScript(spell_warr_intervene); RegisterSpellScript(spell_warr_intervene_charge); RegisterSpellScript(spell_warr_intimidating_shout);