From a5b52789294b76c1b7ecad8db0c53da5e2efb782 Mon Sep 17 00:00:00 2001
From: Andrew <47818697+Nyeriah@users.noreply.github.com>
Date: Thu, 16 Nov 2023 14:00:42 -0300
Subject: [PATCH] refactor(Scripts/World): Clean up script files (#17728)

* refactor(Scripts/World): Clean up script files

* Update boss_azuregos.cpp
---
 src/server/scripts/Kalimdor/boss_azuregos.cpp | 23 ++++++++-----------
 .../scripts/Outland/boss_doomlord_kazzak.cpp  |  7 +++---
 .../scripts/Outland/boss_doomwalker.cpp       |  7 +++---
 .../scripts/World/boss_emerald_dragons.cpp    |  7 +++---
 4 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp
index ec4a539c1..b25769c44 100644
--- a/src/server/scripts/Kalimdor/boss_azuregos.cpp
+++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp
@@ -54,15 +54,15 @@ public:
     {
         boss_azuregosAI(Creature* creature) : ScriptedAI(creature)
         {
-            _scheduler.SetValidator([this]
-                {
-                    return !me->HasUnitState(UNIT_STATE_CASTING);
-                });
+            scheduler.SetValidator([this]
+            {
+                return !me->HasUnitState(UNIT_STATE_CASTING);
+            });
         }
 
         void Reset() override
         {
-            _scheduler.CancelAll();
+            scheduler.CancelAll();
             me->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP);
             me->RestoreFaction();
             me->GetMap()->DoForAllPlayers([&](Player* p)
@@ -89,7 +89,7 @@ public:
             DoCastSelf(SPELL_MARK_OF_FROST_AURA);
             Talk(SAY_AGGRO);
 
-            _scheduler
+            scheduler
                 .Schedule(7s, [this](TaskContext context)
                 {
                     DoCastVictim(SPELL_CLEAVE);
@@ -149,14 +149,11 @@ public:
                 return;
             }
 
-            _scheduler.Update(diff, [this]
-                {
-                    DoMeleeAttackIfReady();
-                });
+            scheduler.Update(diff, [this]
+            {
+                DoMeleeAttackIfReady();
+            });
         }
-
-        protected:
-            TaskScheduler _scheduler;
     };
 
     bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 /*action*/) override
diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
index 340063843..56bf98e16 100644
--- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
+++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
@@ -56,7 +56,7 @@ public:
 
         void Reset() override
         {
-            _scheduler.CancelAll();
+            scheduler.CancelAll();
             _inBerserk = false;
         }
 
@@ -68,7 +68,7 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             Talk(SAY_AGGRO);
-            _scheduler.Schedule(6s, 10s, [this](TaskContext context)
+            scheduler.Schedule(6s, 10s, [this](TaskContext context)
             {
                 DoCastVictim(SPELL_SHADOW_VOLLEY);
                 context.Repeat(4s, 6s);
@@ -132,7 +132,7 @@ public:
             if (!UpdateVictim())
                 return;
 
-            _scheduler.Update(diff);
+            scheduler.Update(diff);
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
 
@@ -140,7 +140,6 @@ public:
         }
 
     private:
-        TaskScheduler _scheduler;
         bool _inBerserk;
     };
 
diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp
index de61c6877..771ddab91 100644
--- a/src/server/scripts/Outland/boss_doomwalker.cpp
+++ b/src/server/scripts/Outland/boss_doomwalker.cpp
@@ -50,7 +50,7 @@ public:
         void Reset() override
         {
             _inEnrage = false;
-            _scheduler.CancelAll();
+            scheduler.CancelAll();
         }
 
         void KilledUnit(Unit* victim) override
@@ -73,7 +73,7 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             Talk(SAY_AGGRO);
-            _scheduler.Schedule(1ms, [this](TaskContext context)
+            scheduler.Schedule(1ms, [this](TaskContext context)
             {
                 if (!HealthAbovePct(20))
                 {
@@ -129,7 +129,7 @@ public:
             if (!UpdateVictim())
                 return;
 
-            _scheduler.Update(diff);
+            scheduler.Update(diff);
             if (me->HasUnitState(UNIT_STATE_CASTING))
                 return;
 
@@ -137,7 +137,6 @@ public:
         }
 
     private:
-        TaskScheduler _scheduler;
         bool _inEnrage;
     };
 
diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp
index e1bfd24fd..cd98b970b 100644
--- a/src/server/scripts/World/boss_emerald_dragons.cpp
+++ b/src/server/scripts/World/boss_emerald_dragons.cpp
@@ -193,9 +193,9 @@ public:
 
         void ScheduleEvents()
         {
-            _scheduler.CancelAll();
+            scheduler.CancelAll();
 
-            _scheduler.Schedule(1s, [this](TaskContext context)
+            scheduler.Schedule(1s, [this](TaskContext context)
             {
                 // Chase target, but don't attack - otherwise just roam around
                 if (Unit* chaseTarget = GetRandomUnitFromDragonThreatList())
@@ -251,13 +251,12 @@ public:
             if (!UpdateVictim())
                 return;
 
-            _scheduler.Update(diff);
+            scheduler.Update(diff);
         }
 
     private:
         ObjectGuid _targetGUID;
         ObjectGuid _dragonGUID;
-        TaskScheduler _scheduler;
     };
 
     CreatureAI* GetAI(Creature* creature) const override