From 2ce9936217dd19843bc00792e9d6f4a52a1ce79a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E4=BD=A9=E8=8C=B9?= Date: Thu, 30 May 2024 09:57:52 -0600 Subject: [PATCH] Fix Naxx 40 Consumption spell --- sql/world/base/naxx40_creatures.sql | 2 +- src/naxx40Scripts/boss_four_horsemen_40.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sql/world/base/naxx40_creatures.sql b/sql/world/base/naxx40_creatures.sql index 7e79409..71f5892 100644 --- a/sql/world/base/naxx40_creatures.sql +++ b/sql/world/base/naxx40_creatures.sql @@ -5680,7 +5680,7 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ -- upstream handles void zone damage incorrectly. Azerothcore (#18807) DELETE FROM `spell_script_names` WHERE `spell_id` = 28865; INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES -(28865,'spell_four_horsemen_consumption'); +(28865,'spell_gen_consumption'); DELETE FROM `creature_template_spell` WHERE `CreatureID` = 16697; UPDATE `creature_template` SET `ScriptName` = '', `AIName` = 'SmartAI' WHERE `entry` = 16697; DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 16697); diff --git a/src/naxx40Scripts/boss_four_horsemen_40.cpp b/src/naxx40Scripts/boss_four_horsemen_40.cpp index 20717e7..2c3eaa4 100644 --- a/src/naxx40Scripts/boss_four_horsemen_40.cpp +++ b/src/naxx40Scripts/boss_four_horsemen_40.cpp @@ -466,9 +466,9 @@ public: } }; -class spell_four_horsemen_consumption : public SpellScript +class spell_gen_consumption : public SpellScript { - PrepareSpellScript(spell_four_horsemen_consumption); + PrepareSpellScript(spell_gen_consumption); void CalculateDamage(SpellEffIndex /*effIndex*/) { @@ -505,7 +505,7 @@ class spell_four_horsemen_consumption : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_four_horsemen_consumption::CalculateDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectLaunchTarget += SpellEffectFn(spell_gen_consumption::CalculateDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; @@ -513,5 +513,5 @@ void AddSC_boss_four_horsemen_40() { new boss_four_horsemen_40(); new spell_four_horsemen_mark(); - RegisterSpellScript(spell_four_horsemen_consumption); + RegisterSpellScript(spell_gen_consumption); }