Core/Scripts: Include cleanup

6 files changed, 48 insertions, 37 deletions

diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
index d552d455cf8..10e2a6f6b29 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
@@ -24,10 +24,12 @@ SDCategory: Magisters' Terrace
 EndScriptData */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
+#include "GameObject.h"
+#include "InstanceScript.h"
 #include "magisters_terrace.h"
-#include "WorldPacket.h"
-#include "Opcodes.h"
+#include "ObjectAccessor.h"
+#include "ScriptedCreature.h"
+#include "TemporarySummon.h"
 
 enum Says
 {
@@ -96,7 +98,7 @@ public:
 
     CreatureAI* GetAI(Creature* c) const override
     {
-        return GetInstanceAI<boss_felblood_kaelthasAI>(c);
+        return GetMagistersTerraceAI<boss_felblood_kaelthasAI>(c);
     }
 
     struct boss_felblood_kaelthasAI : public ScriptedAI
@@ -251,11 +253,7 @@ public:
                 {
                     // Also needs an exception in spell system.
                     unit->CastSpell(unit, SPELL_GRAVITY_LAPSE_FLY, true, 0, 0, me->GetGUID());
-                    // Use packet hack
-                    WorldPacket data(SMSG_MOVE_SET_CAN_FLY, 12);
-                    data << unit->GetGUID();
-                    data << uint32(0);
-                    unit->SendMessageToSet(&data, true);
+                    unit->SetCanFly(true);
                 }
             }
         }
@@ -271,11 +269,7 @@ public:
                 {
                     unit->RemoveAurasDueToSpell(SPELL_GRAVITY_LAPSE_FLY);
                     unit->RemoveAurasDueToSpell(SPELL_GRAVITY_LAPSE_DOT);
-
-                    WorldPacket data(SMSG_MOVE_UNSET_CAN_FLY, 12);
-                    data << unit->GetGUID();
-                    data << uint32(0);
-                    unit->SendMessageToSet(&data, true);
+                    unit->SetCanFly(false);
                 }
             }
         }
@@ -438,7 +432,7 @@ public:
 
     CreatureAI* GetAI(Creature* c) const override
     {
-        return new npc_felkael_flamestrikeAI(c);
+        return GetMagistersTerraceAI<npc_felkael_flamestrikeAI>(c);
     }
 
     struct npc_felkael_flamestrikeAI : public ScriptedAI
@@ -486,7 +480,7 @@ public:
 
     CreatureAI* GetAI(Creature* c) const override
     {
-        return GetInstanceAI<npc_felkael_phoenixAI>(c);
+        return GetMagistersTerraceAI<npc_felkael_phoenixAI>(c);
     }
 
     struct npc_felkael_phoenixAI : public ScriptedAI
@@ -604,7 +598,7 @@ public:
 
     CreatureAI* GetAI(Creature* c) const override
     {
-        return new npc_felkael_phoenix_eggAI(c);
+        return GetMagistersTerraceAI<npc_felkael_phoenix_eggAI>(c);
     }
 
     struct npc_felkael_phoenix_eggAI : public ScriptedAI
@@ -648,7 +642,7 @@ public:
 
     CreatureAI* GetAI(Creature* c) const override
     {
-        return new npc_arcane_sphereAI(c);
+        return GetMagistersTerraceAI<npc_arcane_sphereAI>(c);
     }
 
     struct npc_arcane_sphereAI : public ScriptedAI
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
index 20793316a86..e0afe313965 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
@@ -24,8 +24,11 @@ SDCategory: Magister's Terrace
 EndScriptData */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
+#include "InstanceScript.h"
 #include "magisters_terrace.h"
+#include "ObjectAccessor.h"
+#include "ScriptedCreature.h"
+#include "TemporarySummon.h"
 
 struct Speech
 {
@@ -110,7 +113,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_priestess_delrissaAI>(creature);
+        return GetMagistersTerraceAI<boss_priestess_delrissaAI>(creature);
     }
 
     struct boss_priestess_delrissaAI : public ScriptedAI
@@ -497,7 +500,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_kagani_nightstrikeAI>(creature);
+        return GetMagistersTerraceAI<boss_kagani_nightstrikeAI>(creature);
     }
 
     struct boss_kagani_nightstrikeAI : public boss_priestess_lackey_commonAI
@@ -609,7 +612,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_ellris_duskhallowAI>(creature);
+        return GetMagistersTerraceAI<boss_ellris_duskhallowAI>(creature);
     }
 
     struct boss_ellris_duskhallowAI : public boss_priestess_lackey_commonAI
@@ -708,7 +711,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_eramas_brightblazeAI>(creature);
+        return GetMagistersTerraceAI<boss_eramas_brightblazeAI>(creature);
     }
 
     struct boss_eramas_brightblazeAI : public boss_priestess_lackey_commonAI
@@ -777,7 +780,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_yazzaiAI>(creature);
+        return GetMagistersTerraceAI<boss_yazzaiAI>(creature);
     }
 
     struct boss_yazzaiAI : public boss_priestess_lackey_commonAI
@@ -915,7 +918,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_warlord_salarisAI>(creature);
+        return GetMagistersTerraceAI<boss_warlord_salarisAI>(creature);
     }
 
     struct boss_warlord_salarisAI : public boss_priestess_lackey_commonAI
@@ -1043,7 +1046,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_garaxxasAI>(creature);
+        return GetMagistersTerraceAI<boss_garaxxasAI>(creature);
     }
 
     struct boss_garaxxasAI : public boss_priestess_lackey_commonAI
@@ -1159,7 +1162,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_apokoAI>(creature);
+        return GetMagistersTerraceAI<boss_apokoAI>(creature);
     }
 
     struct boss_apokoAI : public boss_priestess_lackey_commonAI
@@ -1256,7 +1259,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_zelfanAI>(creature);
+        return GetMagistersTerraceAI<boss_zelfanAI>(creature);
     }
 
     struct boss_zelfanAI : public boss_priestess_lackey_commonAI
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
index 76f60754c67..b6f94c74c73 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
@@ -16,8 +16,10 @@
  */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
+#include "InstanceScript.h"
 #include "magisters_terrace.h"
+#include "ObjectAccessor.h"
+#include "ScriptedCreature.h"
 
 enum Says
 {
@@ -263,7 +265,7 @@ class boss_selin_fireheart : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return GetInstanceAI<boss_selin_fireheartAI>(creature);
+            return GetMagistersTerraceAI<boss_selin_fireheartAI>(creature);
         };
 };
 
@@ -289,7 +291,7 @@ class npc_fel_crystal : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return GetInstanceAI<npc_fel_crystalAI>(creature);
+            return GetMagistersTerraceAI<npc_fel_crystalAI>(creature);
         };
 };
 
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
index 421c5ac45af..02f57cd2622 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
@@ -182,7 +182,7 @@ class boss_vexallus : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return GetInstanceAI<boss_vexallusAI>(creature);
+            return GetMagistersTerraceAI<boss_vexallusAI>(creature);
         };
 };
 
@@ -214,7 +214,7 @@ class npc_pure_energy : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return new npc_pure_energyAI(creature);
+            return GetMagistersTerraceAI<npc_pure_energyAI>(creature);
         };
 };
 
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
index d145944bf35..7ff8b3a5d98 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
@@ -16,10 +16,13 @@
  */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
+#include "EventMap.h"
+#include "GameObject.h"
 #include "InstanceScript.h"
 #include "magisters_terrace.h"
-#include "EventMap.h"
+#include "Map.h"
+#include "ScriptedCreature.h"
+#include "TemporarySummon.h"
 
 /*
 0  - Selin Fireheart
@@ -43,7 +46,7 @@ Position const KalecgosSpawnPos = { 164.3747f, -397.1197f, 2.151798f, 1.66219f }
 class instance_magisters_terrace : public InstanceMapScript
 {
     public:
-        instance_magisters_terrace() : InstanceMapScript("instance_magisters_terrace", 585) { }
+        instance_magisters_terrace() : InstanceMapScript(MGTScriptName, 585) { }
 
         struct instance_magisters_terrace_InstanceMapScript : public InstanceScript
         {
@@ -150,7 +153,7 @@ class instance_magisters_terrace : public InstanceMapScript
             void ProcessEvent(WorldObject* obj, uint32 eventId) override
             {
                 if (eventId == EVENT_SPAWN_KALECGOS)
-                    if (!ObjectAccessor::GetCreature(*obj, KalecgosGUID) && Events.Empty())
+                    if (!instance->GetCreature(KalecgosGUID) && Events.Empty())
                        Events.ScheduleEvent(EVENT_SPAWN_KALECGOS, Minutes(1));
             }
 
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
index cfdee423ef1..ff393c32ec5 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
@@ -19,6 +19,9 @@
 #ifndef DEF_MAGISTERS_TERRACE_H
 #define DEF_MAGISTERS_TERRACE_H
 
+#include "CreatureAIImpl.h"
+
+#define MGTScriptName "instance_magisters_terrace"
 #define DataHeader "MT"
 
 uint32 const EncounterCount = 4;
@@ -74,4 +77,10 @@ enum MTMovementData
     PATH_KALECGOS_FLIGHT    = 248440
 };
 
+template<typename AI>
+inline AI* GetMagistersTerraceAI(Creature* creature)
+{
+    return GetInstanceAI<AI>(creature, MGTScriptName);
+}
+
 #endif