Scripts/Events: Update event scripts to new register model 1 (#27823)

(cherry picked from commit 2ccad770bddde55a9f3c561b8e721a0610816880)

5 files changed, 654 insertions, 849 deletions

diff --git a/sql/updates/world/master/2022_03_26_17_world_2022_02_25_00_world.sql b/sql/updates/world/master/2022_03_26_17_world_2022_02_25_00_world.sql
new file mode 100644
index 00000000000..95779db0c16
--- /dev/null
+++ b/sql/updates/world/master/2022_03_26_17_world_2022_02_25_00_world.sql
@@ -0,0 +1,4 @@
+--
+UPDATE `spell_script_names` SET `ScriptName` = 'spell_brewfest_mount_transformation' WHERE `ScriptName` = 'spell_item_brewfest_mount_transformation';
+UPDATE `spell_script_names` SET `ScriptName` = 'spell_love_is_in_the_air_create_heart_candy' WHERE `ScriptName` = 'spell_item_create_heart_candy';
+UPDATE `spell_script_names` SET `ScriptName` = 'spell_lunar_festival_elune_candle' WHERE `ScriptName` = 'spell_gen_elune_candle';
diff --git a/src/server/scripts/Events/brewfest.cpp b/src/server/scripts/Events/brewfest.cpp
index 71c4467669f..084a42bc740 100644
--- a/src/server/scripts/Events/brewfest.cpp
+++ b/src/server/scripts/Events/brewfest.cpp
@@ -43,321 +43,233 @@ enum RamBlaBla
 };
 
 // 42924 - Giddyup!
-class spell_brewfest_giddyup : public SpellScriptLoader
+class spell_brewfest_giddyup : public AuraScript
 {
-    public:
-        spell_brewfest_giddyup() : SpellScriptLoader("spell_brewfest_giddyup") { }
+    PrepareAuraScript(spell_brewfest_giddyup);
 
-        class spell_brewfest_giddyup_AuraScript : public AuraScript
+    void OnChange(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
+    {
+        Unit* target = GetTarget();
+        if (!target->HasAura(SPELL_RENTAL_RACING_RAM) && !target->HasAura(SPELL_SWIFT_WORK_RAM))
         {
-            PrepareAuraScript(spell_brewfest_giddyup_AuraScript);
-
-            void OnChange(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
-            {
-                Unit* target = GetTarget();
-                if (!target->HasAura(SPELL_RENTAL_RACING_RAM) && !target->HasAura(SPELL_SWIFT_WORK_RAM))
-                {
-                    target->RemoveAura(GetId());
-                    return;
-                }
-
-                if (target->HasAura(SPELL_EXHAUSTED_RAM))
-                    return;
+            target->RemoveAura(GetId());
+            return;
+        }
 
-                switch (GetStackAmount())
-                {
-                    case 1: // green
-                        target->RemoveAura(SPELL_RAM_LEVEL_NEUTRAL);
-                        target->RemoveAura(SPELL_RAM_CANTER);
-                        target->CastSpell(target, SPELL_RAM_TROT, true);
-                        break;
-                    case 6: // yellow
-                        target->RemoveAura(SPELL_RAM_TROT);
-                        target->RemoveAura(SPELL_RAM_GALLOP);
-                        target->CastSpell(target, SPELL_RAM_CANTER, true);
-                        break;
-                    case 11: // red
-                        target->RemoveAura(SPELL_RAM_CANTER);
-                        target->CastSpell(target, SPELL_RAM_GALLOP, true);
-                        break;
-                    default:
-                        break;
-                }
-
-                if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_DEFAULT)
-                {
-                    target->RemoveAura(SPELL_RAM_TROT);
-                    target->CastSpell(target, SPELL_RAM_LEVEL_NEUTRAL, true);
-                }
-            }
+        if (target->HasAura(SPELL_EXHAUSTED_RAM))
+            return;
 
-            void OnPeriodic(AuraEffect const* /*aurEff*/)
-            {
-                GetTarget()->RemoveAuraFromStack(GetId());
-            }
-
-            void Register() override
-            {
-                AfterEffectApply += AuraEffectApplyFn(spell_brewfest_giddyup_AuraScript::OnChange, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK);
-                OnEffectRemove += AuraEffectRemoveFn(spell_brewfest_giddyup_AuraScript::OnChange, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK);
-                OnEffectPeriodic += AuraEffectPeriodicFn(spell_brewfest_giddyup_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
-            }
-        };
+        switch (GetStackAmount())
+        {
+            case 1: // green
+                target->RemoveAura(SPELL_RAM_LEVEL_NEUTRAL);
+                target->RemoveAura(SPELL_RAM_CANTER);
+                target->CastSpell(target, SPELL_RAM_TROT, true);
+                break;
+            case 6: // yellow
+                target->RemoveAura(SPELL_RAM_TROT);
+                target->RemoveAura(SPELL_RAM_GALLOP);
+                target->CastSpell(target, SPELL_RAM_CANTER, true);
+                break;
+            case 11: // red
+                target->RemoveAura(SPELL_RAM_CANTER);
+                target->CastSpell(target, SPELL_RAM_GALLOP, true);
+                break;
+            default:
+                break;
+        }
 
-        AuraScript* GetAuraScript() const override
+        if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_DEFAULT)
         {
-            return new spell_brewfest_giddyup_AuraScript();
+            target->RemoveAura(SPELL_RAM_TROT);
+            target->CastSpell(target, SPELL_RAM_LEVEL_NEUTRAL, true);
         }
+    }
+
+    void OnPeriodic(AuraEffect const* /*aurEff*/)
+    {
+        GetTarget()->RemoveAuraFromStack(GetId());
+    }
+
+    void Register() override
+    {
+        AfterEffectApply += AuraEffectApplyFn(spell_brewfest_giddyup::OnChange, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK);
+        OnEffectRemove += AuraEffectRemoveFn(spell_brewfest_giddyup::OnChange, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK);
+        OnEffectPeriodic += AuraEffectPeriodicFn(spell_brewfest_giddyup::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
+    }
 };
 
 // 43310 - Ram Level - Neutral
 // 42992 - Ram - Trot
 // 42993 - Ram - Canter
 // 42994 - Ram - Gallop
-class spell_brewfest_ram : public SpellScriptLoader
+class spell_brewfest_ram : public AuraScript
 {
-    public:
-        spell_brewfest_ram() : SpellScriptLoader("spell_brewfest_ram") { }
+    PrepareAuraScript(spell_brewfest_ram);
 
-        class spell_brewfest_ram_AuraScript : public AuraScript
-        {
-            PrepareAuraScript(spell_brewfest_ram_AuraScript);
+    void OnPeriodic(AuraEffect const* aurEff)
+    {
+        Unit* target = GetTarget();
+        if (target->HasAura(SPELL_EXHAUSTED_RAM))
+            return;
 
-            void OnPeriodic(AuraEffect const* aurEff)
+        switch (GetId())
+        {
+            case SPELL_RAM_LEVEL_NEUTRAL:
+                if (Aura* aura = target->GetAura(SPELL_RAM_FATIGUE))
+                    aura->ModStackAmount(-4);
+                break;
+            case SPELL_RAM_TROT: // green
+                if (Aura* aura = target->GetAura(SPELL_RAM_FATIGUE))
+                    aura->ModStackAmount(-2);
+                if (aurEff->GetTickNumber() == 4)
+                    target->CastSpell(target, SPELL_BREWFEST_QUEST_SPEED_BUNNY_GREEN, true);
+                break;
+            case SPELL_RAM_CANTER:
             {
-                Unit* target = GetTarget();
-                if (target->HasAura(SPELL_EXHAUSTED_RAM))
-                    return;
-
-                switch (GetId())
-                {
-                    case SPELL_RAM_LEVEL_NEUTRAL:
-                        if (Aura* aura = target->GetAura(SPELL_RAM_FATIGUE))
-                            aura->ModStackAmount(-4);
-                        break;
-                    case SPELL_RAM_TROT: // green
-                        if (Aura* aura = target->GetAura(SPELL_RAM_FATIGUE))
-                            aura->ModStackAmount(-2);
-                        if (aurEff->GetTickNumber() == 4)
-                            target->CastSpell(target, SPELL_BREWFEST_QUEST_SPEED_BUNNY_GREEN, true);
-                        break;
-                    case SPELL_RAM_CANTER:
-                    {
-                        CastSpellExtraArgs args(TRIGGERED_FULL_MASK);
-                        args.AddSpellMod(SPELLVALUE_AURA_STACK, 1);
-                        target->CastSpell(target, SPELL_RAM_FATIGUE, args);
-                        if (aurEff->GetTickNumber() == 8)
-                            target->CastSpell(target, SPELL_BREWFEST_QUEST_SPEED_BUNNY_YELLOW, true);
-                        break;
-                    }
-                    case SPELL_RAM_GALLOP:
-                    {
-                        CastSpellExtraArgs args(TRIGGERED_FULL_MASK);
-                        args.AddSpellMod(SPELLVALUE_AURA_STACK, target->HasAura(SPELL_RAM_FATIGUE) ? 4 : 5 /*Hack*/);
-                        target->CastSpell(target, SPELL_RAM_FATIGUE, args);
-                        if (aurEff->GetTickNumber() == 8)
-                            target->CastSpell(target, SPELL_BREWFEST_QUEST_SPEED_BUNNY_RED, true);
-                        break;
-                    }
-                    default:
-                        break;
-                }
-
+                CastSpellExtraArgs args(TRIGGERED_FULL_MASK);
+                args.AddSpellMod(SPELLVALUE_AURA_STACK, 1);
+                target->CastSpell(target, SPELL_RAM_FATIGUE, args);
+                if (aurEff->GetTickNumber() == 8)
+                    target->CastSpell(target, SPELL_BREWFEST_QUEST_SPEED_BUNNY_YELLOW, true);
+                break;
             }
-
-            void Register() override
+            case SPELL_RAM_GALLOP:
             {
-                OnEffectPeriodic += AuraEffectPeriodicFn(spell_brewfest_ram_AuraScript::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
+                CastSpellExtraArgs args(TRIGGERED_FULL_MASK);
+                args.AddSpellMod(SPELLVALUE_AURA_STACK, target->HasAura(SPELL_RAM_FATIGUE) ? 4 : 5 /*Hack*/);
+                target->CastSpell(target, SPELL_RAM_FATIGUE, args);
+                if (aurEff->GetTickNumber() == 8)
+                    target->CastSpell(target, SPELL_BREWFEST_QUEST_SPEED_BUNNY_RED, true);
+                break;
             }
-        };
-
-        AuraScript* GetAuraScript() const override
-        {
-            return new spell_brewfest_ram_AuraScript();
+            default:
+                break;
         }
+
+    }
+
+    void Register() override
+    {
+        OnEffectPeriodic += AuraEffectPeriodicFn(spell_brewfest_ram::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
+    }
 };
 
 // 43052 - Ram Fatigue
-class spell_brewfest_ram_fatigue : public SpellScriptLoader
+class spell_brewfest_ram_fatigue : public AuraScript
 {
-    public:
-        spell_brewfest_ram_fatigue() : SpellScriptLoader("spell_brewfest_ram_fatigue") { }
-
-        class spell_brewfest_ram_fatigue_AuraScript : public AuraScript
-        {
-            PrepareAuraScript(spell_brewfest_ram_fatigue_AuraScript);
-
-            void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
-            {
-                Unit* target = GetTarget();
-
-                if (GetStackAmount() == 101)
-                {
-                    target->RemoveAura(SPELL_RAM_LEVEL_NEUTRAL);
-                    target->RemoveAura(SPELL_RAM_TROT);
-                    target->RemoveAura(SPELL_RAM_CANTER);
-                    target->RemoveAura(SPELL_RAM_GALLOP);
-                    target->RemoveAura(SPELL_GIDDYUP);
-
-                    target->CastSpell(target, SPELL_EXHAUSTED_RAM, true);
-                }
-            }
+    PrepareAuraScript(spell_brewfest_ram_fatigue);
 
-            void Register() override
-            {
-                AfterEffectApply += AuraEffectApplyFn(spell_brewfest_ram_fatigue_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
-            }
-        };
+    void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
+    {
+        Unit* target = GetTarget();
 
-        AuraScript* GetAuraScript() const override
+        if (GetStackAmount() == 101)
         {
-            return new spell_brewfest_ram_fatigue_AuraScript();
+            target->RemoveAura(SPELL_RAM_LEVEL_NEUTRAL);
+            target->RemoveAura(SPELL_RAM_TROT);
+            target->RemoveAura(SPELL_RAM_CANTER);
+            target->RemoveAura(SPELL_RAM_GALLOP);
+            target->RemoveAura(SPELL_GIDDYUP);
+
+            target->CastSpell(target, SPELL_EXHAUSTED_RAM, true);
         }
+    }
+
+    void Register() override
+    {
+        AfterEffectApply += AuraEffectApplyFn(spell_brewfest_ram_fatigue::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
+    }
 };
 
 // 43450 - Brewfest - apple trap - friendly DND
-class spell_brewfest_apple_trap : public SpellScriptLoader
+class spell_brewfest_apple_trap : public AuraScript
 {
-    public:
-        spell_brewfest_apple_trap() : SpellScriptLoader("spell_brewfest_apple_trap") { }
-
-        class spell_brewfest_apple_trap_AuraScript : public AuraScript
-        {
-            PrepareAuraScript(spell_brewfest_apple_trap_AuraScript);
-
-            void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
-            {
-                GetTarget()->RemoveAura(SPELL_RAM_FATIGUE);
-            }
+    PrepareAuraScript(spell_brewfest_apple_trap);
 
-            void Register() override
-            {
-                OnEffectApply += AuraEffectApplyFn(spell_brewfest_apple_trap_AuraScript::OnApply, EFFECT_0, SPELL_AURA_FORCE_REACTION, AURA_EFFECT_HANDLE_REAL);
-            }
-        };
+    void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
+    {
+        GetTarget()->RemoveAura(SPELL_RAM_FATIGUE);
+    }
 
-        AuraScript* GetAuraScript() const override
-        {
-            return new spell_brewfest_apple_trap_AuraScript();
-        }
+    void Register() override
+    {
+        OnEffectApply += AuraEffectApplyFn(spell_brewfest_apple_trap::OnApply, EFFECT_0, SPELL_AURA_FORCE_REACTION, AURA_EFFECT_HANDLE_REAL);
+    }
 };
 
 // 43332 - Exhausted Ram
-class spell_brewfest_exhausted_ram : public SpellScriptLoader
+class spell_brewfest_exhausted_ram : public AuraScript
 {
-    public:
-        spell_brewfest_exhausted_ram() : SpellScriptLoader("spell_brewfest_exhausted_ram") { }
-
-        class spell_brewfest_exhausted_ram_AuraScript : public AuraScript
-        {
-            PrepareAuraScript(spell_brewfest_exhausted_ram_AuraScript);
+    PrepareAuraScript(spell_brewfest_exhausted_ram);
 
-            void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
-            {
-                Unit* target = GetTarget();
-                target->CastSpell(target, SPELL_RAM_LEVEL_NEUTRAL, true);
-            }
-
-            void Register() override
-            {
-                OnEffectRemove += AuraEffectApplyFn(spell_brewfest_exhausted_ram_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_DECREASE_SPEED, AURA_EFFECT_HANDLE_REAL);
-            }
-        };
+    void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
+    {
+        Unit* target = GetTarget();
+        target->CastSpell(target, SPELL_RAM_LEVEL_NEUTRAL, true);
+    }
 
-        AuraScript* GetAuraScript() const override
-        {
-            return new spell_brewfest_exhausted_ram_AuraScript();
-        }
+    void Register() override
+    {
+        OnEffectRemove += AuraEffectApplyFn(spell_brewfest_exhausted_ram::OnRemove, EFFECT_0, SPELL_AURA_MOD_DECREASE_SPEED, AURA_EFFECT_HANDLE_REAL);
+    }
 };
 
 // 43714 - Brewfest - Relay Race - Intro - Force - Player to throw- DND
-class spell_brewfest_relay_race_intro_force_player_to_throw : public SpellScriptLoader
+class spell_brewfest_relay_race_intro_force_player_to_throw : public SpellScript
 {
-    public:
-        spell_brewfest_relay_race_intro_force_player_to_throw() : SpellScriptLoader("spell_brewfest_relay_race_intro_force_player_to_throw") { }
-
-        class spell_brewfest_relay_race_intro_force_player_to_throw_SpellScript : public SpellScript
-        {
-            PrepareSpellScript(spell_brewfest_relay_race_intro_force_player_to_throw_SpellScript);
-
-            void HandleForceCast(SpellEffIndex effIndex)
-            {
-                PreventHitDefaultEffect(effIndex);
-                // All this spells trigger a spell that requires reagents; if the
-                // triggered spell is cast as "triggered", reagents are not consumed
-                GetHitUnit()->CastSpell(nullptr, GetEffectInfo().TriggerSpell, TriggerCastFlags(TRIGGERED_FULL_MASK & ~TRIGGERED_IGNORE_POWER_AND_REAGENT_COST));
-            }
+    PrepareSpellScript(spell_brewfest_relay_race_intro_force_player_to_throw);
 
-            void Register() override
-            {
-                OnEffectHitTarget += SpellEffectFn(spell_brewfest_relay_race_intro_force_player_to_throw_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
-            }
-        };
+    void HandleForceCast(SpellEffIndex effIndex)
+    {
+        PreventHitDefaultEffect(effIndex);
+        // All this spells trigger a spell that requires reagents; if the
+        // triggered spell is cast as "triggered", reagents are not consumed
+        GetHitUnit()->CastSpell(nullptr, GetEffectInfo().TriggerSpell, TriggerCastFlags(TRIGGERED_FULL_MASK & ~TRIGGERED_IGNORE_POWER_AND_REAGENT_COST));
+    }
 
-        SpellScript* GetSpellScript() const override
-        {
-            return new spell_brewfest_relay_race_intro_force_player_to_throw_SpellScript();
-        }
+    void Register() override
+    {
+        OnEffectHitTarget += SpellEffectFn(spell_brewfest_relay_race_intro_force_player_to_throw::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
+    }
 };
 
 // 43755 - Brewfest - Daily - Relay Race - Player - Increase Mount Duration - DND
-class spell_brewfest_relay_race_turn_in : public SpellScriptLoader
+class spell_brewfest_relay_race_turn_in : public SpellScript
 {
-public:
-    spell_brewfest_relay_race_turn_in() : SpellScriptLoader("spell_brewfest_relay_race_turn_in") { }
+    PrepareSpellScript(spell_brewfest_relay_race_turn_in);
 
-    class spell_brewfest_relay_race_turn_in_SpellScript : public SpellScript
+    void HandleDummy(SpellEffIndex effIndex)
     {
-        PrepareSpellScript(spell_brewfest_relay_race_turn_in_SpellScript);
-
-        void HandleDummy(SpellEffIndex effIndex)
-        {
-            PreventHitDefaultEffect(effIndex);
-
-            if (Aura* aura = GetHitUnit()->GetAura(SPELL_SWIFT_WORK_RAM))
-            {
-                aura->SetDuration(aura->GetDuration() + 30 * IN_MILLISECONDS);
-                GetCaster()->CastSpell(GetHitUnit(), SPELL_RELAY_RACE_TURN_IN, TRIGGERED_FULL_MASK);
-            }
-        }
+        PreventHitDefaultEffect(effIndex);
 
-        void Register() override
+        if (Aura* aura = GetHitUnit()->GetAura(SPELL_SWIFT_WORK_RAM))
         {
-            OnEffectHitTarget += SpellEffectFn(spell_brewfest_relay_race_turn_in_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
+            aura->SetDuration(aura->GetDuration() + 30 * IN_MILLISECONDS);
+            GetCaster()->CastSpell(GetHitUnit(), SPELL_RELAY_RACE_TURN_IN, TRIGGERED_FULL_MASK);
         }
-    };
+    }
 
-    SpellScript* GetSpellScript() const override
+    void Register() override
     {
-        return new spell_brewfest_relay_race_turn_in_SpellScript();
+        OnEffectHitTarget += SpellEffectFn(spell_brewfest_relay_race_turn_in::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
     }
 };
 
 // 43876 - Dismount Ram
-class spell_brewfest_dismount_ram : public SpellScriptLoader
+class spell_brewfest_dismount_ram : public SpellScript
 {
-    public:
-        spell_brewfest_dismount_ram() : SpellScriptLoader("spell_brewfest_dismount_ram") { }
-
-        class spell_brewfest_relay_race_intro_force_player_to_throw_SpellScript : public SpellScript
-        {
-            PrepareSpellScript(spell_brewfest_relay_race_intro_force_player_to_throw_SpellScript);
+    PrepareSpellScript(spell_brewfest_dismount_ram);
 
-            void HandleScript(SpellEffIndex /*effIndex*/)
-            {
-                GetCaster()->RemoveAura(SPELL_RENTAL_RACING_RAM);
-            }
-
-            void Register() override
-            {
-                OnEffectHitTarget += SpellEffectFn(spell_brewfest_relay_race_intro_force_player_to_throw_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
-            }
-        };
+    void HandleScript(SpellEffIndex /*effIndex*/)
+    {
+        GetCaster()->RemoveAura(SPELL_RENTAL_RACING_RAM);
+    }
 
-        SpellScript* GetSpellScript() const override
-        {
-            return new spell_brewfest_relay_race_intro_force_player_to_throw_SpellScript();
-        }
+    void Register() override
+    {
+        OnEffectHitTarget += SpellEffectFn(spell_brewfest_dismount_ram::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
+    }
 };
 
 enum RamBlub
@@ -399,56 +311,45 @@ enum RamBlub
 // 43260 Brewfest  - Barker Bunny 2
 // 43261 Brewfest  - Barker Bunny 3
 // 43262 Brewfest  - Barker Bunny 4
-class spell_brewfest_barker_bunny : public SpellScriptLoader
+class spell_brewfest_barker_bunny : public AuraScript
 {
-    public:
-        spell_brewfest_barker_bunny() : SpellScriptLoader("spell_brewfest_barker_bunny") { }
-
-        class spell_brewfest_barker_bunny_AuraScript : public AuraScript
-        {
-            PrepareAuraScript(spell_brewfest_barker_bunny_AuraScript);
+    PrepareAuraScript(spell_brewfest_barker_bunny);
 
-            bool Load() override
-            {
-                return GetUnitOwner()->GetTypeId() == TYPEID_PLAYER;
-            }
-
-            void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
-            {
-                Player* target = GetTarget()->ToPlayer();
+    bool Load() override
+    {
+        return GetUnitOwner()->GetTypeId() == TYPEID_PLAYER;
+    }
 
-                uint32 BroadcastTextId = 0;
+    void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
+    {
+        Player* target = GetTarget()->ToPlayer();
 
-                if (target->GetQuestStatus(QUEST_BARK_FOR_DROHNS_DISTILLERY) == QUEST_STATUS_INCOMPLETE ||
-                    target->GetQuestStatus(QUEST_BARK_FOR_DROHNS_DISTILLERY) == QUEST_STATUS_COMPLETE)
-                    BroadcastTextId = RAND(SAY_DROHN_DISTILLERY_1, SAY_DROHN_DISTILLERY_2, SAY_DROHN_DISTILLERY_3, SAY_DROHN_DISTILLERY_4);
+        uint32 BroadcastTextId = 0;
 
-                if (target->GetQuestStatus(QUEST_BARK_FOR_TCHALIS_VOODOO_BREWERY) == QUEST_STATUS_INCOMPLETE ||
-                    target->GetQuestStatus(QUEST_BARK_FOR_TCHALIS_VOODOO_BREWERY) == QUEST_STATUS_COMPLETE)
-                    BroadcastTextId = RAND(SAY_TCHALIS_VOODOO_1, SAY_TCHALIS_VOODOO_2, SAY_TCHALIS_VOODOO_3, SAY_TCHALIS_VOODOO_4);
+        if (target->GetQuestStatus(QUEST_BARK_FOR_DROHNS_DISTILLERY) == QUEST_STATUS_INCOMPLETE ||
+            target->GetQuestStatus(QUEST_BARK_FOR_DROHNS_DISTILLERY) == QUEST_STATUS_COMPLETE)
+            BroadcastTextId = RAND(SAY_DROHN_DISTILLERY_1, SAY_DROHN_DISTILLERY_2, SAY_DROHN_DISTILLERY_3, SAY_DROHN_DISTILLERY_4);
 
-                if (target->GetQuestStatus(QUEST_BARK_BARLEYBREW) == QUEST_STATUS_INCOMPLETE ||
-                    target->GetQuestStatus(QUEST_BARK_BARLEYBREW) == QUEST_STATUS_COMPLETE)
-                    BroadcastTextId = RAND(SAY_BARLEYBREW_1, SAY_BARLEYBREW_2, SAY_BARLEYBREW_3, SAY_BARLEYBREW_4);
+        if (target->GetQuestStatus(QUEST_BARK_FOR_TCHALIS_VOODOO_BREWERY) == QUEST_STATUS_INCOMPLETE ||
+            target->GetQuestStatus(QUEST_BARK_FOR_TCHALIS_VOODOO_BREWERY) == QUEST_STATUS_COMPLETE)
+            BroadcastTextId = RAND(SAY_TCHALIS_VOODOO_1, SAY_TCHALIS_VOODOO_2, SAY_TCHALIS_VOODOO_3, SAY_TCHALIS_VOODOO_4);
 
-                if (target->GetQuestStatus(QUEST_BARK_FOR_THUNDERBREWS) == QUEST_STATUS_INCOMPLETE ||
-                    target->GetQuestStatus(QUEST_BARK_FOR_THUNDERBREWS) == QUEST_STATUS_COMPLETE)
-                    BroadcastTextId = RAND(SAY_THUNDERBREWS_1, SAY_THUNDERBREWS_2, SAY_THUNDERBREWS_3, SAY_THUNDERBREWS_4);
+        if (target->GetQuestStatus(QUEST_BARK_BARLEYBREW) == QUEST_STATUS_INCOMPLETE ||
+            target->GetQuestStatus(QUEST_BARK_BARLEYBREW) == QUEST_STATUS_COMPLETE)
+            BroadcastTextId = RAND(SAY_BARLEYBREW_1, SAY_BARLEYBREW_2, SAY_BARLEYBREW_3, SAY_BARLEYBREW_4);
 
-                if (BroadcastTextId)
-                    target->Talk(BroadcastTextId, CHAT_MSG_SAY, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_SAY), target);
-            }
+        if (target->GetQuestStatus(QUEST_BARK_FOR_THUNDERBREWS) == QUEST_STATUS_INCOMPLETE ||
+            target->GetQuestStatus(QUEST_BARK_FOR_THUNDERBREWS) == QUEST_STATUS_COMPLETE)
+            BroadcastTextId = RAND(SAY_THUNDERBREWS_1, SAY_THUNDERBREWS_2, SAY_THUNDERBREWS_3, SAY_THUNDERBREWS_4);
 
-            void Register() override
-            {
-                OnEffectApply += AuraEffectApplyFn(spell_brewfest_barker_bunny_AuraScript::OnApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
-            }
-        };
+        if (BroadcastTextId)
+            target->Talk(BroadcastTextId, CHAT_MSG_SAY, sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_SAY), target);
+    }
 
-        AuraScript* GetAuraScript() const override
-        {
-            return new spell_brewfest_barker_bunny_AuraScript();
-        }
+    void Register() override
+    {
+        OnEffectApply += AuraEffectApplyFn(spell_brewfest_barker_bunny::OnApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
+    }
 };
 
 enum BrewfestMountTransformation
@@ -461,9 +362,11 @@ enum BrewfestMountTransformation
     SPELL_BREWFEST_MOUNT_TRANSFORM_REVERSE      = 52845,
 };
 
-class spell_item_brewfest_mount_transformation : public SpellScript
+// 49357 - Brewfest Mount Transformation
+// 52845 - Brewfest Mount Transformation (Faction Swap)
+class spell_brewfest_mount_transformation : public SpellScript
 {
-    PrepareSpellScript(spell_item_brewfest_mount_transformation);
+    PrepareSpellScript(spell_brewfest_mount_transformation);
 
     bool Validate(SpellInfo const* /*spell*/) override
     {
@@ -507,20 +410,20 @@ class spell_item_brewfest_mount_transformation : public SpellScript
 
     void Register() override
     {
-        OnEffectHitTarget += SpellEffectFn(spell_item_brewfest_mount_transformation::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
+        OnEffectHit += SpellEffectFn(spell_brewfest_mount_transformation::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
     }
 };
 
 void AddSC_event_brewfest()
 {
-    new spell_brewfest_giddyup();
-    new spell_brewfest_ram();
-    new spell_brewfest_ram_fatigue();
-    new spell_brewfest_apple_trap();
-    new spell_brewfest_exhausted_ram();
-    new spell_brewfest_relay_race_intro_force_player_to_throw();
-    new spell_brewfest_relay_race_turn_in();
-    new spell_brewfest_dismount_ram();
-    new spell_brewfest_barker_bunny();
-    RegisterSpellScript(spell_item_brewfest_mount_transformation);
+    RegisterSpellScript(spell_brewfest_giddyup);
+    RegisterSpellScript(spell_brewfest_ram);
+    RegisterSpellScript(spell_brewfest_ram_fatigue);
+    RegisterSpellScript(spell_brewfest_apple_trap);
+    RegisterSpellScript(spell_brewfest_exhausted_ram);
+    RegisterSpellScript(spell_brewfest_relay_race_intro_force_player_to_throw);
+    RegisterSpellScript(spell_brewfest_relay_race_turn_in);
+    RegisterSpellScript(spell_brewfest_dismount_ram);
+    RegisterSpellScript(spell_brewfest_barker_bunny);
+    RegisterSpellScript(spell_brewfest_mount_transformation);
 }
diff --git a/src/server/scripts/Events/hallows_end.cpp b/src/server/scripts/Events/hallows_end.cpp
index e9ee27259e7..1ed0500eb40 100644
--- a/src/server/scripts/Events/hallows_end.cpp
+++ b/src/server/scripts/Events/hallows_end.cpp
@@ -18,6 +18,7 @@
 #include "ScriptMgr.h"
 #include "CreatureAIImpl.h"
 #include "Player.h"
+#include "ScriptedCreature.h"
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
 
@@ -31,42 +32,7 @@ enum HallowEndCandysSpells
     SPELL_HALLOWS_END_CANDY_MALE_DEFIAS_PIRATE    = 44743  // Effect 1: Apply Aura: Change Model (Defias Pirate, Male).   Effect 2: Increase Swim Speed, Value: 50%
 };
 
-// 24930 - Hallow's End Candy
-class spell_hallow_end_candy : public SpellScriptLoader
-{
-    public:
-        spell_hallow_end_candy() : SpellScriptLoader("spell_hallow_end_candy") { }
-
-        class spell_hallow_end_candy_SpellScript : public SpellScript
-        {
-            PrepareSpellScript(spell_hallow_end_candy_SpellScript);
-
-            bool Validate(SpellInfo const* /*spellInfo*/) override
-            {
-                return ValidateSpellInfo(spells);
-            }
-
-            void HandleDummy(SpellEffIndex /*effIndex*/)
-            {
-                GetCaster()->CastSpell(GetCaster(), spells[urand(0, 3)], true);
-            }
-
-            void Register() override
-            {
-                OnEffectHit += SpellEffectFn(spell_hallow_end_candy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
-            }
-
-        private:
-            static uint32 const spells[4];
-        };
-
-        SpellScript* GetSpellScript() const override
-        {
-            return new spell_hallow_end_candy_SpellScript();
-        }
-};
-
-uint32 const spell_hallow_end_candy::spell_hallow_end_candy_SpellScript::spells[4] =
+std::array<uint32, 4> const CandysSpells =
 {
     SPELL_HALLOWS_END_CANDY_ORANGE_GIANT,
     SPELL_HALLOWS_END_CANDY_SKELETON,
@@ -74,48 +40,58 @@ uint32 const spell_hallow_end_candy::spell_hallow_end_candy_SpellScript::spells[
     SPELL_HALLOWS_END_CANDY_GHOST
 };
 
-// 24926 - Hallow's End Candy
-class spell_hallow_end_candy_pirate : public SpellScriptLoader
+// 24930 - Hallow's End Candy
+class spell_hallow_end_candy : public SpellScript
 {
-    public:
-        spell_hallow_end_candy_pirate() : SpellScriptLoader("spell_hallow_end_candy_pirate") { }
-
-        class spell_hallow_end_candy_pirate_AuraScript : public AuraScript
-        {
-            PrepareAuraScript(spell_hallow_end_candy_pirate_AuraScript);
+    PrepareSpellScript(spell_hallow_end_candy);
 
-            bool Validate(SpellInfo const* /*spellInfo*/) override
-            {
-                return ValidateSpellInfo(
-                {
-                    SPELL_HALLOWS_END_CANDY_FEMALE_DEFIAS_PIRATE,
-                    SPELL_HALLOWS_END_CANDY_MALE_DEFIAS_PIRATE
-                });
-            }
+    bool Validate(SpellInfo const* /*spellInfo*/) override
+    {
+        return ValidateSpellInfo(CandysSpells);
+    }
 
-            void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
-            {
-                uint32 spell = GetTarget()->GetNativeGender() == GENDER_FEMALE ? SPELL_HALLOWS_END_CANDY_FEMALE_DEFIAS_PIRATE : SPELL_HALLOWS_END_CANDY_MALE_DEFIAS_PIRATE;
-                GetTarget()->CastSpell(GetTarget(), spell, true);
-            }
+    void HandleDummy(SpellEffIndex /*effIndex*/)
+    {
+        GetCaster()->CastSpell(GetCaster(), Trinity::Containers::SelectRandomContainerElement(CandysSpells), true);
+    }
 
-            void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
-            {
-                uint32 spell = GetTarget()->GetNativeGender() == GENDER_FEMALE ? SPELL_HALLOWS_END_CANDY_FEMALE_DEFIAS_PIRATE : SPELL_HALLOWS_END_CANDY_MALE_DEFIAS_PIRATE;
-                GetTarget()->RemoveAurasDueToSpell(spell);
-            }
+    void Register() override
+    {
+        OnEffectHit += SpellEffectFn(spell_hallow_end_candy::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
+    }
+};
 
-            void Register() override
-            {
-                AfterEffectApply += AuraEffectApplyFn(spell_hallow_end_candy_pirate_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_MOD_INCREASE_SWIM_SPEED, AURA_EFFECT_HANDLE_REAL);
-                AfterEffectRemove += AuraEffectRemoveFn(spell_hallow_end_candy_pirate_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_MOD_INCREASE_SWIM_SPEED, AURA_EFFECT_HANDLE_REAL);
-            }
-        };
+// 24926 - Hallow's End Candy
+class spell_hallow_end_candy_pirate : public AuraScript
+{
+    PrepareAuraScript(spell_hallow_end_candy_pirate);
 
-        AuraScript* GetAuraScript() const override
+    bool Validate(SpellInfo const* /*spellInfo*/) override
+    {
+        return ValidateSpellInfo(
         {
-            return new spell_hallow_end_candy_pirate_AuraScript();
-        }
+            SPELL_HALLOWS_END_CANDY_FEMALE_DEFIAS_PIRATE,
+            SPELL_HALLOWS_END_CANDY_MALE_DEFIAS_PIRATE
+        });
+    }
+
+    void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
+    {
+        uint32 spell = GetTarget()->GetNativeGender() == GENDER_FEMALE ? SPELL_HALLOWS_END_CANDY_FEMALE_DEFIAS_PIRATE : SPELL_HALLOWS_END_CANDY_MALE_DEFIAS_PIRATE;
+        GetTarget()->CastSpell(GetTarget(), spell, true);
+    }
+
+    void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
+    {
+        uint32 spell = GetTarget()->GetNativeGender() == GENDER_FEMALE ? SPELL_HALLOWS_END_CANDY_FEMALE_DEFIAS_PIRATE : SPELL_HALLOWS_END_CANDY_MALE_DEFIAS_PIRATE;
+        GetTarget()->RemoveAurasDueToSpell(spell);
+    }
+
+    void Register() override
+    {
+        AfterEffectApply += AuraEffectApplyFn(spell_hallow_end_candy_pirate::HandleApply, EFFECT_0, SPELL_AURA_MOD_INCREASE_SWIM_SPEED, AURA_EFFECT_HANDLE_REAL);
+        AfterEffectRemove += AuraEffectRemoveFn(spell_hallow_end_candy_pirate::HandleRemove, EFFECT_0, SPELL_AURA_MOD_INCREASE_SWIM_SPEED, AURA_EFFECT_HANDLE_REAL);
+    }
 };
 
 enum TrickSpells
@@ -133,74 +109,63 @@ enum TrickSpells
 };
 
 // 24750 - Trick
-class spell_hallow_end_trick : public SpellScriptLoader
+class spell_hallow_end_trick : public SpellScript
 {
-    public:
-        spell_hallow_end_trick() : SpellScriptLoader("spell_hallow_end_trick") { }
+    PrepareSpellScript(spell_hallow_end_trick);
 
-        class spell_hallow_end_trick_SpellScript : public SpellScript
+    bool Validate(SpellInfo const* /*spell*/) override
+    {
+        return ValidateSpellInfo(
         {
-            PrepareSpellScript(spell_hallow_end_trick_SpellScript);
-
-            bool Validate(SpellInfo const* /*spell*/) override
-            {
-                return ValidateSpellInfo(
-                {
-                    SPELL_PIRATE_COSTUME_MALE,
-                    SPELL_PIRATE_COSTUME_FEMALE,
-                    SPELL_NINJA_COSTUME_MALE,
-                    SPELL_NINJA_COSTUME_FEMALE,
-                    SPELL_LEPER_GNOME_COSTUME_MALE,
-                    SPELL_LEPER_GNOME_COSTUME_FEMALE,
-                    SPELL_SKELETON_COSTUME,
-                    SPELL_GHOST_COSTUME_MALE,
-                    SPELL_GHOST_COSTUME_FEMALE,
-                    SPELL_TRICK_BUFF
-                });
-            }
-
-            void HandleScript(SpellEffIndex /*effIndex*/)
-            {
-                Unit* caster = GetCaster();
-                if (Player* target = GetHitPlayer())
-                {
-                    uint8 gender = target->GetNativeGender();
-                    uint32 spellId = SPELL_TRICK_BUFF;
-                    switch (urand(0, 5))
-                    {
-                        case 1:
-                            spellId = gender == GENDER_FEMALE ? SPELL_LEPER_GNOME_COSTUME_FEMALE : SPELL_LEPER_GNOME_COSTUME_MALE;
-                            break;
-                        case 2:
-                            spellId = gender == GENDER_FEMALE ? SPELL_PIRATE_COSTUME_FEMALE : SPELL_PIRATE_COSTUME_MALE;
-                            break;
-                        case 3:
-                            spellId = gender == GENDER_FEMALE ? SPELL_GHOST_COSTUME_FEMALE : SPELL_GHOST_COSTUME_MALE;
-                            break;
-                        case 4:
-                            spellId = gender == GENDER_FEMALE ? SPELL_NINJA_COSTUME_FEMALE : SPELL_NINJA_COSTUME_MALE;
-                            break;
-                        case 5:
-                            spellId = SPELL_SKELETON_COSTUME;
-                            break;
-                        default:
-                            break;
-                    }
-
-                    caster->CastSpell(target, spellId, true);
-                }
-            }
+            SPELL_PIRATE_COSTUME_MALE,
+            SPELL_PIRATE_COSTUME_FEMALE,
+            SPELL_NINJA_COSTUME_MALE,
+            SPELL_NINJA_COSTUME_FEMALE,
+            SPELL_LEPER_GNOME_COSTUME_MALE,
+            SPELL_LEPER_GNOME_COSTUME_FEMALE,
+            SPELL_SKELETON_COSTUME,
+            SPELL_GHOST_COSTUME_MALE,
+            SPELL_GHOST_COSTUME_FEMALE,
+            SPELL_TRICK_BUFF
+        });
+    }
 
-            void Register() override
+    void HandleScript(SpellEffIndex /*effIndex*/)
+    {
+        Unit* caster = GetCaster();
+        if (Player* target = GetHitPlayer())
+        {
+            uint8 gender = target->GetNativeGender();
+            uint32 spellId = SPELL_TRICK_BUFF;
+            switch (urand(0, 5))
             {
-                OnEffectHitTarget += SpellEffectFn(spell_hallow_end_trick_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
+                case 1:
+                    spellId = gender == GENDER_FEMALE ? SPELL_LEPER_GNOME_COSTUME_FEMALE : SPELL_LEPER_GNOME_COSTUME_MALE;
+                    break;
+                case 2:
+                    spellId = gender == GENDER_FEMALE ? SPELL_PIRATE_COSTUME_FEMALE : SPELL_PIRATE_COSTUME_MALE;
+                    break;
+                case 3:
+                    spellId = gender == GENDER_FEMALE ? SPELL_GHOST_COSTUME_FEMALE : SPELL_GHOST_COSTUME_MALE;
+                    break;
+                case 4:
+                    spellId = gender == GENDER_FEMALE ? SPELL_NINJA_COSTUME_FEMALE : SPELL_NINJA_COSTUME_MALE;
+                    break;
+                case 5:
+                    spellId = SPELL_SKELETON_COSTUME;
+                    break;
+                default:
+                    break;
             }
-        };
 
-        SpellScript* GetSpellScript() const override
-        {
-            return new spell_hallow_end_trick_SpellScript();
+            caster->CastSpell(target, spellId, true);
         }
+    }
+
+    void Register() override
+    {
+        OnEffectHitTarget += SpellEffectFn(spell_hallow_end_trick::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
+    }
 };
 
 enum TrickOrTreatSpells
@@ -214,79 +179,57 @@ enum TrickOrTreatSpells
 };
 
 // 24751 - Trick or Treat
-class spell_hallow_end_trick_or_treat : public SpellScriptLoader
+class spell_hallow_end_trick_or_treat : public SpellScript
 {
-    public:
-        spell_hallow_end_trick_or_treat() : SpellScriptLoader("spell_hallow_end_trick_or_treat") { }
-
-        class spell_hallow_end_trick_or_treat_SpellScript : public SpellScript
-        {
-            PrepareSpellScript(spell_hallow_end_trick_or_treat_SpellScript);
-
-            bool Validate(SpellInfo const* /*spell*/) override
-            {
-                return ValidateSpellInfo({ SPELL_TRICK, SPELL_TREAT, SPELL_TRICKED_OR_TREATED });
-            }
-
-            void HandleScript(SpellEffIndex /*effIndex*/)
-            {
-                Unit* caster = GetCaster();
-                if (Player* target = GetHitPlayer())
-                {
-                    caster->CastSpell(target, roll_chance_i(50) ? SPELL_TRICK : SPELL_TREAT, true);
-                    caster->CastSpell(target, SPELL_TRICKED_OR_TREATED, true);
-                }
-            }
+    PrepareSpellScript(spell_hallow_end_trick_or_treat);
 
-            void Register() override
-            {
-                OnEffectHitTarget += SpellEffectFn(spell_hallow_end_trick_or_treat_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
-            }
-        };
+    bool Validate(SpellInfo const* /*spell*/) override
+    {
+        return ValidateSpellInfo({ SPELL_TRICK, SPELL_TREAT, SPELL_TRICKED_OR_TREATED });
+    }
 
-        SpellScript* GetSpellScript() const override
+    void HandleScript(SpellEffIndex /*effIndex*/)
+    {
+        Unit* caster = GetCaster();
+        if (Player* target = GetHitPlayer())
         {
-            return new spell_hallow_end_trick_or_treat_SpellScript();
+            caster->CastSpell(target, roll_chance_i(50) ? SPELL_TRICK : SPELL_TREAT, true);
+            caster->CastSpell(target, SPELL_TRICKED_OR_TREATED, true);
         }
+    }
+
+    void Register() override
+    {
+        OnEffectHitTarget += SpellEffectFn(spell_hallow_end_trick_or_treat::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
+    }
 };
 
 // 44436 - Tricky Treat
-class spell_hallow_end_tricky_treat : public SpellScriptLoader
+class spell_hallow_end_tricky_treat : public SpellScript
 {
-    public:
-        spell_hallow_end_tricky_treat() : SpellScriptLoader("spell_hallow_end_tricky_treat") { }
+    PrepareSpellScript(spell_hallow_end_tricky_treat);
 
-        class spell_hallow_end_tricky_treat_SpellScript : public SpellScript
+    bool Validate(SpellInfo const* /*spell*/) override
+    {
+        return ValidateSpellInfo(
         {
-            PrepareSpellScript(spell_hallow_end_tricky_treat_SpellScript);
-
-            bool Validate(SpellInfo const* /*spell*/) override
-            {
-                return ValidateSpellInfo(
-                {
-                    SPELL_TRICKY_TREAT_SPEED,
-                    SPELL_TRICKY_TREAT_TRIGGER,
-                    SPELL_UPSET_TUMMY
-                });
-            }
-
-            void HandleScript(SpellEffIndex /*effIndex*/)
-            {
-                Unit* caster = GetCaster();
-                if (caster->HasAura(SPELL_TRICKY_TREAT_TRIGGER) && caster->GetAuraCount(SPELL_TRICKY_TREAT_SPEED) > 3 && roll_chance_i(33))
-                    caster->CastSpell(caster, SPELL_UPSET_TUMMY, true);
-            }
+            SPELL_TRICKY_TREAT_SPEED,
+            SPELL_TRICKY_TREAT_TRIGGER,
+            SPELL_UPSET_TUMMY
+        });
+    }
 
-            void Register() override
-            {
-                OnEffectHitTarget += SpellEffectFn(spell_hallow_end_tricky_treat_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
-            }
-        };
+    void HandleScript(SpellEffIndex /*effIndex*/)
+    {
+        Unit* caster = GetCaster();
+        if (caster->HasAura(SPELL_TRICKY_TREAT_TRIGGER) && caster->GetAuraCount(SPELL_TRICKY_TREAT_SPEED) > 3 && roll_chance_i(33))
+            caster->CastSpell(caster, SPELL_UPSET_TUMMY, true);
+    }
 
-        SpellScript* GetSpellScript() const override
-        {
-            return new spell_hallow_end_tricky_treat_SpellScript();
-        }
+    void Register() override
+    {
+        OnEffectHitTarget += SpellEffectFn(spell_hallow_end_tricky_treat::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
+    }
 };
 
 enum HallowendData
@@ -302,79 +245,68 @@ enum HallowendData
 };
 
 // 24717, 24718, 24719, 24720, 24724, 24733, 24737, 24741
-class spell_hallow_end_wand : public SpellScriptLoader
+class spell_hallow_end_wand : public SpellScript
 {
-public:
-    spell_hallow_end_wand() : SpellScriptLoader("spell_hallow_end_wand") {}
+    PrepareSpellScript(spell_hallow_end_wand);
 
-    class spell_hallow_end_wand_SpellScript : public SpellScript
+    bool Validate(SpellInfo const* /*spellEntry*/) override
     {
-        PrepareSpellScript(spell_hallow_end_wand_SpellScript);
-
-        bool Validate(SpellInfo const* /*spellEntry*/) override
-        {
-            return ValidateSpellInfo(
-            {
-                SPELL_PIRATE_COSTUME_MALE,
-                SPELL_PIRATE_COSTUME_FEMALE,
-                SPELL_NINJA_COSTUME_MALE,
-                SPELL_NINJA_COSTUME_FEMALE,
-                SPELL_LEPER_GNOME_COSTUME_MALE,
-                SPELL_LEPER_GNOME_COSTUME_FEMALE,
-                SPELL_GHOST_COSTUME_MALE,
-                SPELL_GHOST_COSTUME_FEMALE
-            });
-        }
-
-        void HandleScriptEffect()
+        return ValidateSpellInfo(
         {
-            Unit* caster = GetCaster();
-            Unit* target = GetHitUnit();
+            SPELL_PIRATE_COSTUME_MALE,
+            SPELL_PIRATE_COSTUME_FEMALE,
+            SPELL_NINJA_COSTUME_MALE,
+            SPELL_NINJA_COSTUME_FEMALE,
+            SPELL_LEPER_GNOME_COSTUME_MALE,
+            SPELL_LEPER_GNOME_COSTUME_FEMALE,
+            SPELL_GHOST_COSTUME_MALE,
+            SPELL_GHOST_COSTUME_FEMALE
+        });
+    }
 
-            uint32 spellId = 0;
-            uint8 gender = target->GetNativeGender();
+    void HandleScriptEffect()
+    {
+        Unit* caster = GetCaster();
+        Unit* target = GetHitUnit();
 
-            switch (GetSpellInfo()->Id)
-            {
-                case SPELL_HALLOWED_WAND_LEPER_GNOME:
-                    spellId = gender ? SPELL_LEPER_GNOME_COSTUME_FEMALE : SPELL_LEPER_GNOME_COSTUME_MALE;
-                    break;
-                case SPELL_HALLOWED_WAND_PIRATE:
-                    spellId = gender ? SPELL_PIRATE_COSTUME_FEMALE : SPELL_PIRATE_COSTUME_MALE;
-                    break;
-                case SPELL_HALLOWED_WAND_GHOST:
-                    spellId = gender ? SPELL_GHOST_COSTUME_FEMALE : SPELL_GHOST_COSTUME_MALE;
-                    break;
-                case SPELL_HALLOWED_WAND_NINJA:
-                    spellId = gender ? SPELL_NINJA_COSTUME_FEMALE : SPELL_NINJA_COSTUME_MALE;
-                    break;
-                case SPELL_HALLOWED_WAND_RANDOM:
-                    spellId = RAND(SPELL_HALLOWED_WAND_PIRATE, SPELL_HALLOWED_WAND_NINJA, SPELL_HALLOWED_WAND_LEPER_GNOME, SPELL_HALLOWED_WAND_SKELETON, SPELL_HALLOWED_WAND_WISP, SPELL_HALLOWED_WAND_GHOST, SPELL_HALLOWED_WAND_BAT);
-                    break;
-                default:
-                    return;
-            }
-            caster->CastSpell(target, spellId, true);
-        }
+        uint32 spellId = 0;
+        uint8 gender = target->GetNativeGender();
 
-        void Register() override
+        switch (GetSpellInfo()->Id)
         {
-            AfterHit += SpellHitFn(spell_hallow_end_wand_SpellScript::HandleScriptEffect);
+            case SPELL_HALLOWED_WAND_LEPER_GNOME:
+                spellId = gender ? SPELL_LEPER_GNOME_COSTUME_FEMALE : SPELL_LEPER_GNOME_COSTUME_MALE;
+                break;
+            case SPELL_HALLOWED_WAND_PIRATE:
+                spellId = gender ? SPELL_PIRATE_COSTUME_FEMALE : SPELL_PIRATE_COSTUME_MALE;
+                break;
+            case SPELL_HALLOWED_WAND_GHOST:
+                spellId = gender ? SPELL_GHOST_COSTUME_FEMALE : SPELL_GHOST_COSTUME_MALE;
+                break;
+            case SPELL_HALLOWED_WAND_NINJA:
+                spellId = gender ? SPELL_NINJA_COSTUME_FEMALE : SPELL_NINJA_COSTUME_MALE;
+                break;
+            case SPELL_HALLOWED_WAND_RANDOM:
+                spellId = RAND(SPELL_HALLOWED_WAND_PIRATE, SPELL_HALLOWED_WAND_NINJA, SPELL_HALLOWED_WAND_LEPER_GNOME, SPELL_HALLOWED_WAND_SKELETON, SPELL_HALLOWED_WAND_WISP, SPELL_HALLOWED_WAND_GHOST, SPELL_HALLOWED_WAND_BAT);
+                break;
+            default:
+                return;
         }
-    };
+        caster->CastSpell(target, spellId, true);
+    }
 
-    SpellScript* GetSpellScript() const override
+    void Register() override
     {
-        return new spell_hallow_end_wand_SpellScript();
+        AfterHit += SpellHitFn(spell_hallow_end_wand::HandleScriptEffect);
     }
 };
 
 void AddSC_event_hallows_end()
 {
-    new spell_hallow_end_candy();
-    new spell_hallow_end_candy_pirate();
-    new spell_hallow_end_trick();
-    new spell_hallow_end_trick_or_treat();
-    new spell_hallow_end_tricky_treat();
-    new spell_hallow_end_wand();
+    RegisterSpellScript(spell_hallow_end_candy);
+    RegisterSpellScript(spell_hallow_end_candy_pirate);
+    RegisterSpellScript(spell_hallow_end_trick);
+    RegisterSpellScript(spell_hallow_end_trick_or_treat);
+    RegisterSpellScript(spell_hallow_end_tricky_treat);
+    RegisterSpellScript(spell_hallow_end_wand);
 }
diff --git a/src/server/scripts/Events/love_is_in_the_air.cpp b/src/server/scripts/Events/love_is_in_the_air.cpp
index ea267f5fefb..da14388823c 100644
--- a/src/server/scripts/Events/love_is_in_the_air.cpp
+++ b/src/server/scripts/Events/love_is_in_the_air.cpp
@@ -124,30 +124,28 @@ std::array<uint32, 8> const CreateHeartCandySpells =
 };
 
 // 26678 - Create Heart Candy
-class spell_item_create_heart_candy : public SpellScript
+class spell_love_is_in_the_air_create_heart_candy : public SpellScript
 {
-    PrepareSpellScript(spell_item_create_heart_candy);
+    PrepareSpellScript(spell_love_is_in_the_air_create_heart_candy);
 
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(CreateHeartCandySpells);
     }
 
-    void HandleScript(SpellEffIndex effIndex)
+    void HandleScript(SpellEffIndex /*effIndex*/)
     {
-        PreventHitDefaultEffect(effIndex);
-        if (Player* target = GetHitPlayer())
-            target->CastSpell(target, Trinity::Containers::SelectRandomContainerElement(CreateHeartCandySpells), true);
+        GetCaster()->CastSpell(GetCaster(), Trinity::Containers::SelectRandomContainerElement(CreateHeartCandySpells), true);
     }
 
     void Register() override
     {
-        OnEffectHitTarget += SpellEffectFn(spell_item_create_heart_candy::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
+        OnEffectHit += SpellEffectFn(spell_love_is_in_the_air_create_heart_candy::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
     }
 };
 
 void AddSC_event_love_is_in_the_air()
 {
     RegisterSpellScript(spell_love_is_in_the_air_romantic_picnic);
-    RegisterSpellScript(spell_item_create_heart_candy);
+    RegisterSpellScript(spell_love_is_in_the_air_create_heart_candy);
 }
diff --git a/src/server/scripts/Events/lunar_festival.cpp b/src/server/scripts/Events/lunar_festival.cpp
index 55d93905f94..bfdc590655e 100644
--- a/src/server/scripts/Events/lunar_festival.cpp
+++ b/src/server/scripts/Events/lunar_festival.cpp
@@ -84,223 +84,212 @@ enum Fireworks
 
 Position omenSummonPos = {7558.993f, -2839.999f, 450.0214f, 4.46f};
 
-class npc_firework : public CreatureScript
+struct npc_firework : public ScriptedAI
 {
-public:
-    npc_firework() : CreatureScript("npc_firework") { }
+    npc_firework(Creature* creature) : ScriptedAI(creature) { }
 
-    struct npc_fireworkAI : public ScriptedAI
+    bool isCluster()
     {
-        npc_fireworkAI(Creature* creature) : ScriptedAI(creature) { }
-
-        bool isCluster()
+        switch (me->GetEntry())
         {
-            switch (me->GetEntry())
-            {
-                case NPC_FIREWORK_BLUE:
-                case NPC_FIREWORK_GREEN:
-                case NPC_FIREWORK_PURPLE:
-                case NPC_FIREWORK_RED:
-                case NPC_FIREWORK_YELLOW:
-                case NPC_FIREWORK_WHITE:
-                case NPC_FIREWORK_BIG_BLUE:
-                case NPC_FIREWORK_BIG_GREEN:
-                case NPC_FIREWORK_BIG_PURPLE:
-                case NPC_FIREWORK_BIG_RED:
-                case NPC_FIREWORK_BIG_YELLOW:
-                case NPC_FIREWORK_BIG_WHITE:
-                    return false;
-                case NPC_CLUSTER_BLUE:
-                case NPC_CLUSTER_GREEN:
-                case NPC_CLUSTER_PURPLE:
-                case NPC_CLUSTER_RED:
-                case NPC_CLUSTER_YELLOW:
-                case NPC_CLUSTER_WHITE:
-                case NPC_CLUSTER_BIG_BLUE:
-                case NPC_CLUSTER_BIG_GREEN:
-                case NPC_CLUSTER_BIG_PURPLE:
-                case NPC_CLUSTER_BIG_RED:
-                case NPC_CLUSTER_BIG_YELLOW:
-                case NPC_CLUSTER_BIG_WHITE:
-                case NPC_CLUSTER_ELUNE:
-                default:
-                    return true;
-            }
+            case NPC_FIREWORK_BLUE:
+            case NPC_FIREWORK_GREEN:
+            case NPC_FIREWORK_PURPLE:
+            case NPC_FIREWORK_RED:
+            case NPC_FIREWORK_YELLOW:
+            case NPC_FIREWORK_WHITE:
+            case NPC_FIREWORK_BIG_BLUE:
+            case NPC_FIREWORK_BIG_GREEN:
+            case NPC_FIREWORK_BIG_PURPLE:
+            case NPC_FIREWORK_BIG_RED:
+            case NPC_FIREWORK_BIG_YELLOW:
+            case NPC_FIREWORK_BIG_WHITE:
+                return false;
+            case NPC_CLUSTER_BLUE:
+            case NPC_CLUSTER_GREEN:
+            case NPC_CLUSTER_PURPLE:
+            case NPC_CLUSTER_RED:
+            case NPC_CLUSTER_YELLOW:
+            case NPC_CLUSTER_WHITE:
+            case NPC_CLUSTER_BIG_BLUE:
+            case NPC_CLUSTER_BIG_GREEN:
+            case NPC_CLUSTER_BIG_PURPLE:
+            case NPC_CLUSTER_BIG_RED:
+            case NPC_CLUSTER_BIG_YELLOW:
+            case NPC_CLUSTER_BIG_WHITE:
+            case NPC_CLUSTER_ELUNE:
+            default:
+                return true;
         }
+    }
 
-        GameObject* FindNearestLauncher()
-        {
-            GameObject* launcher = nullptr;
-
-            if (isCluster())
-            {
-                GameObject* launcher1 = GetClosestGameObjectWithEntry(me, GO_CLUSTER_LAUNCHER_1, 0.5f);
-                GameObject* launcher2 = GetClosestGameObjectWithEntry(me, GO_CLUSTER_LAUNCHER_2, 0.5f);
-                GameObject* launcher3 = GetClosestGameObjectWithEntry(me, GO_CLUSTER_LAUNCHER_3, 0.5f);
-                GameObject* launcher4 = GetClosestGameObjectWithEntry(me, GO_CLUSTER_LAUNCHER_4, 0.5f);
-
-                if (launcher1)
-                    launcher = launcher1;
-                else if (launcher2)
-                    launcher = launcher2;
-                else if (launcher3)
-                    launcher = launcher3;
-                else if (launcher4)
-                    launcher = launcher4;
-            }
-            else
-            {
-                GameObject* launcher1 = GetClosestGameObjectWithEntry(me, GO_FIREWORK_LAUNCHER_1, 0.5f);
-                GameObject* launcher2 = GetClosestGameObjectWithEntry(me, GO_FIREWORK_LAUNCHER_2, 0.5f);
-                GameObject* launcher3 = GetClosestGameObjectWithEntry(me, GO_FIREWORK_LAUNCHER_3, 0.5f);
-
-                if (launcher1)
-                    launcher = launcher1;
-                else if (launcher2)
-                    launcher = launcher2;
-                else if (launcher3)
-                    launcher = launcher3;
-            }
+    GameObject* FindNearestLauncher()
+    {
+        GameObject* launcher = nullptr;
 
-            return launcher;
+        if (isCluster())
+        {
+            GameObject* launcher1 = GetClosestGameObjectWithEntry(me, GO_CLUSTER_LAUNCHER_1, 0.5f);
+            GameObject* launcher2 = GetClosestGameObjectWithEntry(me, GO_CLUSTER_LAUNCHER_2, 0.5f);
+            GameObject* launcher3 = GetClosestGameObjectWithEntry(me, GO_CLUSTER_LAUNCHER_3, 0.5f);
+            GameObject* launcher4 = GetClosestGameObjectWithEntry(me, GO_CLUSTER_LAUNCHER_4, 0.5f);
+
+            if (launcher1)
+                launcher = launcher1;
+            else if (launcher2)
+                launcher = launcher2;
+            else if (launcher3)
+                launcher = launcher3;
+            else if (launcher4)
+                launcher = launcher4;
+        }
+        else
+        {
+            GameObject* launcher1 = GetClosestGameObjectWithEntry(me, GO_FIREWORK_LAUNCHER_1, 0.5f);
+            GameObject* launcher2 = GetClosestGameObjectWithEntry(me, GO_FIREWORK_LAUNCHER_2, 0.5f);
+            GameObject* launcher3 = GetClosestGameObjectWithEntry(me, GO_FIREWORK_LAUNCHER_3, 0.5f);
+
+            if (launcher1)
+                launcher = launcher1;
+            else if (launcher2)
+                launcher = launcher2;
+            else if (launcher3)
+                launcher = launcher3;
         }
 
-        uint32 GetFireworkSpell(uint32 entry)
+        return launcher;
+    }
+
+    uint32 GetFireworkSpell(uint32 entry)
+    {
+        switch (entry)
         {
-            switch (entry)
-            {
-                case NPC_FIREWORK_BLUE:
-                    return SPELL_ROCKET_BLUE;
-                case NPC_FIREWORK_GREEN:
-                    return SPELL_ROCKET_GREEN;
-                case NPC_FIREWORK_PURPLE:
-                    return SPELL_ROCKET_PURPLE;
-                case NPC_FIREWORK_RED:
-                    return SPELL_ROCKET_RED;
-                case NPC_FIREWORK_YELLOW:
-                    return SPELL_ROCKET_YELLOW;
-                case NPC_FIREWORK_WHITE:
-                    return SPELL_ROCKET_WHITE;
-                case NPC_FIREWORK_BIG_BLUE:
-                    return SPELL_ROCKET_BIG_BLUE;
-                case NPC_FIREWORK_BIG_GREEN:
-                    return SPELL_ROCKET_BIG_GREEN;
-                case NPC_FIREWORK_BIG_PURPLE:
-                    return SPELL_ROCKET_BIG_PURPLE;
-                case NPC_FIREWORK_BIG_RED:
-                    return SPELL_ROCKET_BIG_RED;
-                case NPC_FIREWORK_BIG_YELLOW:
-                    return SPELL_ROCKET_BIG_YELLOW;
-                case NPC_FIREWORK_BIG_WHITE:
-                    return SPELL_ROCKET_BIG_WHITE;
-                default:
-                    return 0;
-            }
+            case NPC_FIREWORK_BLUE:
+                return SPELL_ROCKET_BLUE;
+            case NPC_FIREWORK_GREEN:
+                return SPELL_ROCKET_GREEN;
+            case NPC_FIREWORK_PURPLE:
+                return SPELL_ROCKET_PURPLE;
+            case NPC_FIREWORK_RED:
+                return SPELL_ROCKET_RED;
+            case NPC_FIREWORK_YELLOW:
+                return SPELL_ROCKET_YELLOW;
+            case NPC_FIREWORK_WHITE:
+                return SPELL_ROCKET_WHITE;
+            case NPC_FIREWORK_BIG_BLUE:
+                return SPELL_ROCKET_BIG_BLUE;
+            case NPC_FIREWORK_BIG_GREEN:
+                return SPELL_ROCKET_BIG_GREEN;
+            case NPC_FIREWORK_BIG_PURPLE:
+                return SPELL_ROCKET_BIG_PURPLE;
+            case NPC_FIREWORK_BIG_RED:
+                return SPELL_ROCKET_BIG_RED;
+            case NPC_FIREWORK_BIG_YELLOW:
+                return SPELL_ROCKET_BIG_YELLOW;
+            case NPC_FIREWORK_BIG_WHITE:
+                return SPELL_ROCKET_BIG_WHITE;
+            default:
+                return 0;
         }
+    }
+
+    uint32 GetFireworkGameObjectId()
+    {
+        uint32 spellId = 0;
 
-        uint32 GetFireworkGameObjectId()
+        switch (me->GetEntry())
         {
-            uint32 spellId = 0;
+            case NPC_CLUSTER_BLUE:
+                spellId = GetFireworkSpell(NPC_FIREWORK_BLUE);
+                break;
+            case NPC_CLUSTER_GREEN:
+                spellId = GetFireworkSpell(NPC_FIREWORK_GREEN);
+                break;
+            case NPC_CLUSTER_PURPLE:
+                spellId = GetFireworkSpell(NPC_FIREWORK_PURPLE);
+                break;
+            case NPC_CLUSTER_RED:
+                spellId = GetFireworkSpell(NPC_FIREWORK_RED);
+                break;
+            case NPC_CLUSTER_YELLOW:
+                spellId = GetFireworkSpell(NPC_FIREWORK_YELLOW);
+                break;
+            case NPC_CLUSTER_WHITE:
+                spellId = GetFireworkSpell(NPC_FIREWORK_WHITE);
+                break;
+            case NPC_CLUSTER_BIG_BLUE:
+                spellId = GetFireworkSpell(NPC_FIREWORK_BIG_BLUE);
+                break;
+            case NPC_CLUSTER_BIG_GREEN:
+                spellId = GetFireworkSpell(NPC_FIREWORK_BIG_GREEN);
+                break;
+            case NPC_CLUSTER_BIG_PURPLE:
+                spellId = GetFireworkSpell(NPC_FIREWORK_BIG_PURPLE);
+                break;
+            case NPC_CLUSTER_BIG_RED:
+                spellId = GetFireworkSpell(NPC_FIREWORK_BIG_RED);
+                break;
+            case NPC_CLUSTER_BIG_YELLOW:
+                spellId = GetFireworkSpell(NPC_FIREWORK_BIG_YELLOW);
+                break;
+            case NPC_CLUSTER_BIG_WHITE:
+                spellId = GetFireworkSpell(NPC_FIREWORK_BIG_WHITE);
+                break;
+            case NPC_CLUSTER_ELUNE:
+                spellId = GetFireworkSpell(urand(NPC_FIREWORK_BLUE, NPC_FIREWORK_WHITE));
+                break;
+        }
 
-            switch (me->GetEntry())
-            {
-                case NPC_CLUSTER_BLUE:
-                    spellId = GetFireworkSpell(NPC_FIREWORK_BLUE);
-                    break;
-                case NPC_CLUSTER_GREEN:
-                    spellId = GetFireworkSpell(NPC_FIREWORK_GREEN);
-                    break;
-                case NPC_CLUSTER_PURPLE:
-                    spellId = GetFireworkSpell(NPC_FIREWORK_PURPLE);
-                    break;
-                case NPC_CLUSTER_RED:
-                    spellId = GetFireworkSpell(NPC_FIREWORK_RED);
-                    break;
-                case NPC_CLUSTER_YELLOW:
-                    spellId = GetFireworkSpell(NPC_FIREWORK_YELLOW);
-                    break;
-                case NPC_CLUSTER_WHITE:
-                    spellId = GetFireworkSpell(NPC_FIREWORK_WHITE);
-                    break;
-                case NPC_CLUSTER_BIG_BLUE:
-                    spellId = GetFireworkSpell(NPC_FIREWORK_BIG_BLUE);
-                    break;
-                case NPC_CLUSTER_BIG_GREEN:
-                    spellId = GetFireworkSpell(NPC_FIREWORK_BIG_GREEN);
-                    break;
-                case NPC_CLUSTER_BIG_PURPLE:
-                    spellId = GetFireworkSpell(NPC_FIREWORK_BIG_PURPLE);
-                    break;
-                case NPC_CLUSTER_BIG_RED:
-                    spellId = GetFireworkSpell(NPC_FIREWORK_BIG_RED);
-                    break;
-                case NPC_CLUSTER_BIG_YELLOW:
-                    spellId = GetFireworkSpell(NPC_FIREWORK_BIG_YELLOW);
-                    break;
-                case NPC_CLUSTER_BIG_WHITE:
-                    spellId = GetFireworkSpell(NPC_FIREWORK_BIG_WHITE);
-                    break;
-                case NPC_CLUSTER_ELUNE:
-                    spellId = GetFireworkSpell(urand(NPC_FIREWORK_BLUE, NPC_FIREWORK_WHITE));
-                    break;
-            }
+        SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId, DIFFICULTY_NONE);
 
-            SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId, DIFFICULTY_NONE);
+        if (spellInfo && spellInfo->GetEffect(EFFECT_0).Effect == SPELL_EFFECT_SUMMON_OBJECT_WILD)
+            return spellInfo->GetEffect(EFFECT_0).MiscValue;
 
-            if (spellInfo && spellInfo->GetEffect(EFFECT_0).Effect == SPELL_EFFECT_SUMMON_OBJECT_WILD)
-                return spellInfo->GetEffect(EFFECT_0).MiscValue;
+        return 0;
+    }
 
-            return 0;
+    void Reset() override
+    {
+        if (GameObject* launcher = FindNearestLauncher())
+        {
+            launcher->SendCustomAnim(ANIM_GO_LAUNCH_FIREWORK);
+            me->SetOrientation(launcher->GetOrientation() + float(M_PI) / 2);
         }
+        else
+            return;
 
-        void Reset() override
+        if (isCluster())
         {
-            if (GameObject* launcher = FindNearestLauncher())
-            {
-                launcher->SendCustomAnim(ANIM_GO_LAUNCH_FIREWORK);
-                me->SetOrientation(launcher->GetOrientation() + float(M_PI) / 2);
-            }
-            else
-                return;
-
-            if (isCluster())
+            // Check if we are near Elune'ara lake south, if so try to summon Omen or a minion
+            if (me->GetZoneId() == ZONE_MOONGLADE)
             {
-                // Check if we are near Elune'ara lake south, if so try to summon Omen or a minion
-                if (me->GetZoneId() == ZONE_MOONGLADE)
+                if (!me->FindNearestCreature(NPC_OMEN, 100.0f) && me->GetDistance2d(omenSummonPos.GetPositionX(), omenSummonPos.GetPositionY()) <= 100.0f)
                 {
-                    if (!me->FindNearestCreature(NPC_OMEN, 100.0f) && me->GetDistance2d(omenSummonPos.GetPositionX(), omenSummonPos.GetPositionY()) <= 100.0f)
+                    switch (urand(0, 9))
                     {
-                        switch (urand(0, 9))
-                        {
-                            case 0:
-                            case 1:
-                            case 2:
-                            case 3:
-                                if (Creature* minion = me->SummonCreature(NPC_MINION_OF_OMEN, me->GetPositionX()+frand(-5.0f, 5.0f), me->GetPositionY()+frand(-5.0f, 5.0f), me->GetPositionZ(), 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20s))
-                                    minion->AI()->AttackStart(me->SelectNearestPlayer(20.0f));
-                                break;
-                            case 9:
-                                me->SummonCreature(NPC_OMEN, omenSummonPos);
-                                break;
-                        }
+                        case 0:
+                        case 1:
+                        case 2:
+                        case 3:
+                            if (Creature* minion = me->SummonCreature(NPC_MINION_OF_OMEN, me->GetPositionX()+frand(-5.0f, 5.0f), me->GetPositionY()+frand(-5.0f, 5.0f), me->GetPositionZ(), 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20s))
+                                minion->AI()->AttackStart(me->SelectNearestPlayer(20.0f));
+                            break;
+                        case 9:
+                            me->SummonCreature(NPC_OMEN, omenSummonPos);
+                            break;
                     }
                 }
-                if (me->GetEntry() == NPC_CLUSTER_ELUNE)
-                    DoCast(SPELL_LUNAR_FORTUNE);
-
-                float displacement = 0.7f;
-                for (uint8 i = 0; i < 4; i++)
-                    me->SummonGameObject(GetFireworkGameObjectId(), me->GetPositionX() + (i % 2 == 0 ? displacement : -displacement), me->GetPositionY() + (i > 1 ? displacement : -displacement), me->GetPositionZ() + 4.0f, me->GetOrientation(), QuaternionData::fromEulerAnglesZYX(me->GetOrientation(), 0.0f, 0.0f), 1s);
             }
-            else
-                //me->CastSpell(me, GetFireworkSpell(me->GetEntry()), true);
-                me->CastSpell(me->GetPosition(), GetFireworkSpell(me->GetEntry()), true);
-        }
-    };
+            if (me->GetEntry() == NPC_CLUSTER_ELUNE)
+                DoCast(SPELL_LUNAR_FORTUNE);
 
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return new npc_fireworkAI(creature);
+            float displacement = 0.7f;
+            for (uint8 i = 0; i < 4; i++)
+                me->SummonGameObject(GetFireworkGameObjectId(), me->GetPositionX() + (i % 2 == 0 ? displacement : -displacement), me->GetPositionY() + (i > 1 ? displacement : -displacement), me->GetPositionZ() + 4.0f, me->GetOrientation(), QuaternionData::fromEulerAnglesZYX(me->GetOrientation(), 0.0f, 0.0f), 1s);
+        }
+        else
+            //me->CastSpell(me, GetFireworkSpell(me->GetEntry()), true);
+            me->CastSpell(me->GetPosition(), GetFireworkSpell(me->GetEntry()), true);
     }
 };
 
@@ -323,128 +312,106 @@ enum Omen
     EVENT_DESPAWN               = 3,
 };
 
-class npc_omen : public CreatureScript
+struct npc_omen : public ScriptedAI
 {
-public:
-    npc_omen() : CreatureScript("npc_omen") { }
-
-    struct npc_omenAI : public ScriptedAI
+    npc_omen(Creature* creature) : ScriptedAI(creature)
     {
-        npc_omenAI(Creature* creature) : ScriptedAI(creature)
-        {
-            me->SetImmuneToPC(true);
-            me->GetMotionMaster()->MovePoint(1, 7549.977f, -2855.137f, 456.9678f);
-        }
-
-        EventMap events;
+        me->SetImmuneToPC(true);
+        me->GetMotionMaster()->MovePoint(1, 7549.977f, -2855.137f, 456.9678f);
+    }
 
-        void MovementInform(uint32 type, uint32 pointId) override
-        {
-            if (type != POINT_MOTION_TYPE)
-                return;
+    EventMap events;
 
-            if (pointId == 1)
-            {
-                me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation());
-                me->SetImmuneToPC(false);
-                if (Player* player = me->SelectNearestPlayer(40.0f))
-                    AttackStart(player);
-            }
-        }
+    void MovementInform(uint32 type, uint32 pointId) override
+    {
+        if (type != POINT_MOTION_TYPE)
+            return;
 
-        void JustEngagedWith(Unit* /*attacker*/) override
+        if (pointId == 1)
         {
-            events.Reset();
-            events.ScheduleEvent(EVENT_CAST_CLEAVE, 3s, 5s);
-            events.ScheduleEvent(EVENT_CAST_STARFALL, 8s, 10s);
+            me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation());
+            me->SetImmuneToPC(false);
+            if (Player* player = me->SelectNearestPlayer(40.0f))
+                AttackStart(player);
         }
+    }
 
-        void JustDied(Unit* /*killer*/) override
-        {
-            DoCast(SPELL_OMEN_SUMMON_SPOTLIGHT);
-        }
+    void JustEngagedWith(Unit* /*attacker*/) override
+    {
+        events.Reset();
+        events.ScheduleEvent(EVENT_CAST_CLEAVE, 3s, 5s);
+        events.ScheduleEvent(EVENT_CAST_STARFALL, 8s, 10s);
+    }
+
+    void JustDied(Unit* /*killer*/) override
+    {
+        DoCast(SPELL_OMEN_SUMMON_SPOTLIGHT);
+    }
 
-        void SpellHit(WorldObject* /*caster*/, SpellInfo const* spellInfo) override
+    void SpellHit(WorldObject* /*caster*/, SpellInfo const* spellInfo) override
+    {
+        if (spellInfo->Id == SPELL_ELUNE_CANDLE)
         {
-            if (spellInfo->Id == SPELL_ELUNE_CANDLE)
-            {
-                if (me->HasAura(SPELL_OMEN_STARFALL))
-                    me->RemoveAurasDueToSpell(SPELL_OMEN_STARFALL);
+            if (me->HasAura(SPELL_OMEN_STARFALL))
+                me->RemoveAurasDueToSpell(SPELL_OMEN_STARFALL);
 
-                events.RescheduleEvent(EVENT_CAST_STARFALL, 14s, 16s);
-            }
+            events.RescheduleEvent(EVENT_CAST_STARFALL, 14s, 16s);
         }
+    }
 
-        void UpdateAI(uint32 diff) override
-        {
-            if (!UpdateVictim())
-                return;
-
-            events.Update(diff);
+    void UpdateAI(uint32 diff) override
+    {
+        if (!UpdateVictim())
+            return;
 
-            switch (events.ExecuteEvent())
-            {
-                case EVENT_CAST_CLEAVE:
-                    DoCastVictim(SPELL_OMEN_CLEAVE);
-                    events.ScheduleEvent(EVENT_CAST_CLEAVE, 8s, 10s);
-                    break;
-                case EVENT_CAST_STARFALL:
-                    if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0))
-                        DoCast(target, SPELL_OMEN_STARFALL);
-                    events.ScheduleEvent(EVENT_CAST_STARFALL, 14s, 16s);
-                    break;
-            }
+        events.Update(diff);
 
-            DoMeleeAttackIfReady();
+        switch (events.ExecuteEvent())
+        {
+            case EVENT_CAST_CLEAVE:
+                DoCastVictim(SPELL_OMEN_CLEAVE);
+                events.ScheduleEvent(EVENT_CAST_CLEAVE, 8s, 10s);
+                break;
+            case EVENT_CAST_STARFALL:
+                if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0))
+                    DoCast(target, SPELL_OMEN_STARFALL);
+                events.ScheduleEvent(EVENT_CAST_STARFALL, 14s, 16s);
+                break;
         }
-    };
 
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return new npc_omenAI(creature);
+        DoMeleeAttackIfReady();
     }
 };
 
-class npc_giant_spotlight : public CreatureScript
+struct npc_giant_spotlight : public ScriptedAI
 {
-public:
-    npc_giant_spotlight() : CreatureScript("npc_giant_spotlight") { }
+    npc_giant_spotlight(Creature* creature) : ScriptedAI(creature) { }
 
-    struct npc_giant_spotlightAI : public ScriptedAI
+    EventMap events;
+
+    void Reset() override
     {
-        npc_giant_spotlightAI(Creature* creature) : ScriptedAI(creature) { }
+        events.Reset();
+        events.ScheduleEvent(EVENT_DESPAWN, 5min);
+    }
 
-        EventMap events;
+    void UpdateAI(uint32 diff) override
+    {
+        events.Update(diff);
 
-        void Reset() override
+        if (events.ExecuteEvent() == EVENT_DESPAWN)
         {
-            events.Reset();
-            events.ScheduleEvent(EVENT_DESPAWN, 5min);
-        }
+            if (GameObject* trap = me->FindNearestGameObject(GO_ELUNE_TRAP_1, 5.0f))
+                trap->RemoveFromWorld();
 
-        void UpdateAI(uint32 diff) override
-        {
-            events.Update(diff);
+            if (GameObject* trap = me->FindNearestGameObject(GO_ELUNE_TRAP_2, 5.0f))
+                trap->RemoveFromWorld();
 
-            if (events.ExecuteEvent() == EVENT_DESPAWN)
-            {
-                if (GameObject* trap = me->FindNearestGameObject(GO_ELUNE_TRAP_1, 5.0f))
-                    trap->RemoveFromWorld();
+            if (Creature* omen = me->FindNearestCreature(NPC_OMEN, 5.0f, false))
+                omen->DespawnOrUnsummon();
 
-                if (GameObject* trap = me->FindNearestGameObject(GO_ELUNE_TRAP_2, 5.0f))
-                    trap->RemoveFromWorld();
-
-                if (Creature* omen = me->FindNearestCreature(NPC_OMEN, 5.0f, false))
-                    omen->DespawnOrUnsummon();
-
-                me->DespawnOrUnsummon();
-            }
+            me->DespawnOrUnsummon();
         }
-    };
-
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return new npc_giant_spotlightAI(creature);
     }
 };
 
@@ -457,9 +424,10 @@ enum EluneCandle
     SPELL_ELUNE_CANDLE_NORMAL      = 26636
 };
 
-class spell_gen_elune_candle : public SpellScript
+// 26374 - Elune's Candle
+class spell_lunar_festival_elune_candle : public SpellScript
 {
-    PrepareSpellScript(spell_gen_elune_candle);
+    PrepareSpellScript(spell_lunar_festival_elune_candle);
 
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
@@ -503,14 +471,14 @@ class spell_gen_elune_candle : public SpellScript
 
     void Register() override
     {
-        OnEffectHitTarget += SpellEffectFn(spell_gen_elune_candle::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
+        OnEffectHitTarget += SpellEffectFn(spell_lunar_festival_elune_candle::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
     }
 };
 
 void AddSC_event_lunar_festival()
 {
-    new npc_firework();
-    new npc_omen();
-    new npc_giant_spotlight();
-    RegisterSpellScript(spell_gen_elune_candle);
+    RegisterCreatureAI(npc_firework);
+    RegisterCreatureAI(npc_omen);
+    RegisterCreatureAI(npc_giant_spotlight);
+    RegisterSpellScript(spell_lunar_festival_elune_candle);
 }