Core: ported headers cleanup from master branch

28 files changed, 161 insertions, 146 deletions

diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
index 07d833bb234..4e891c9ba7a 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -24,9 +24,13 @@ SDCategory: Tempest Keep, The Eye
 EndScriptData */
 
 #include "ScriptMgr.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
+#include "ObjectAccessor.h"
 #include "ScriptedCreature.h"
-#include "the_eye.h"
 #include "SpellInfo.h"
+#include "TemporarySummon.h"
+#include "the_eye.h"
 
 enum Spells
 {
@@ -185,13 +189,13 @@ class boss_alar : public CreatureScript
                 }
             }
 
-            void SpellHit(Unit*, const SpellInfo* spell) override
+            void SpellHit(Unit*, SpellInfo const* spell) override
             {
                 if (spell->Id == SPELL_DIVE_BOMB_VISUAL)
                 {
                     me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true);
                     me->SetDisplayId(11686);
-                    //me->SendUpdateObjectToAllExcept(NULL);
+                    //me->SendUpdateObjectToAllExcept(nullptr);
                 }
             }
 
@@ -432,7 +436,7 @@ class boss_alar : public CreatureScript
                     }
                     else
                     {
-                        Unit* target = NULL;
+                        Unit* target = nullptr;
                         target = me->SelectNearestTargetInAttackDistance(5);
                         if (target)
                             AttackStart(target);
@@ -448,7 +452,7 @@ class boss_alar : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return GetInstanceAI<boss_alarAI>(creature);
+            return GetTheEyeAI<boss_alarAI>(creature);
         }
 };
 
@@ -520,7 +524,7 @@ class npc_ember_of_alar : public CreatureScript
 
                 if (toDie)
                 {
-                    me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                    me->DealDamage(me, me->GetHealth(), nullptr, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, nullptr, false);
                     //me->SetVisibility(VISIBILITY_OFF);
                 }
 
@@ -531,7 +535,7 @@ class npc_ember_of_alar : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return GetInstanceAI<npc_ember_of_alarAI>(creature);
+            return GetTheEyeAI<npc_ember_of_alarAI>(creature);
         }
 };
 
@@ -553,7 +557,7 @@ class npc_flame_patch_alar : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return new npc_flame_patch_alarAI(creature);
+            return GetTheEyeAI<npc_flame_patch_alarAI>(creature);
         }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
index 3ba299d2ea0..813910f5bc5 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
@@ -24,10 +24,13 @@ SDCategory: Tempest Keep, The Eye
 EndScriptData */
 
 #include "ScriptMgr.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
+#include "ObjectAccessor.h"
 #include "ScriptedCreature.h"
+#include "SpellAuras.h"
 #include "SpellScript.h"
-#include "SpellAuraEffects.h"
-
+#include "TemporarySummon.h"
 #include "the_eye.h"
 
 enum Yells
@@ -289,7 +292,7 @@ class boss_high_astromancer_solarian : public CreatureScript
                         //After these 50 seconds she portals to the middle of the room and disappears, leaving 3 light portals behind.
                         me->GetMotionMaster()->Clear();
                         me->UpdatePosition(CENTER_X, CENTER_Y, CENTER_Z, CENTER_O);
-                        for (uint8 i=0; i <= 2; ++i)
+                        for (uint8 i = 0; i <= 2; ++i)
                         {
                             if (!i)
                             {
@@ -306,15 +309,15 @@ class boss_high_astromancer_solarian : public CreatureScript
                         }
                         if ((std::abs(Portals[2][0] - Portals[1][0]) < 7) && (std::abs(Portals[2][1] - Portals[1][1]) < 7))
                         {
-                            int i=1;
+                            int i = 1;
                             if (std::abs(CENTER_X + 26.0f - Portals[2][0]) < 7)
                                 i = -1;
-                            Portals[2][0] = Portals[2][0]+7*i;
+                            Portals[2][0] = Portals[2][0] + 7 * i;
                             Portals[2][1] = Portal_Y(Portals[2][0], LARGE_PORTAL_RADIUS);
                         }
-                        for (int i=0; i <= 2; ++i)
+                        for (int i = 0; i <= 2; ++i)
                         {
-                            if (Creature* Summoned = me->SummonCreature(NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT, Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O, TEMPSUMMON_TIMED_DESPAWN, Phase2_Timer+Phase3_Timer+AppearDelay_Timer+1700))
+                            if (Creature* Summoned = me->SummonCreature(NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT, Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O, TEMPSUMMON_TIMED_DESPAWN, Phase2_Timer + Phase3_Timer + AppearDelay_Timer + 1700))
                             {
                                 Summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                                 Summoned->CastSpell(Summoned, SPELL_SPOTLIGHT, false);
@@ -323,7 +326,7 @@ class boss_high_astromancer_solarian : public CreatureScript
                         AppearDelay = true;
                     }
                     else
-                        Phase1_Timer-=diff;
+                        Phase1_Timer -= diff;
                 }
                 else if (Phase == 2)
                 {
@@ -410,7 +413,7 @@ class boss_high_astromancer_solarian : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return GetInstanceAI<boss_high_astromancer_solarianAI>(creature);
+            return GetTheEyeAI<boss_high_astromancer_solarianAI>(creature);
         }
 };
 
@@ -455,7 +458,7 @@ class npc_solarium_priest : public CreatureScript
 
                 if (healTimer <= diff)
                 {
-                    Unit* target = NULL;
+                    Unit* target = nullptr;
                     switch (urand(0, 1))
                     {
                         case 0:
@@ -497,7 +500,7 @@ class npc_solarium_priest : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return GetInstanceAI<npc_solarium_priestAI>(creature);
+            return GetTheEyeAI<npc_solarium_priestAI>(creature);
         }
 };
 
@@ -512,9 +515,7 @@ class spell_astromancer_wrath_of_the_astromancer : public SpellScriptLoader
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
-                if (!sSpellMgr->GetSpellInfo(SPELL_WRATH_OF_THE_ASTROMANCER_DOT))
-                    return false;
-                return true;
+                return ValidateSpellInfo({ SPELL_WRATH_OF_THE_ASTROMANCER_DOT });
             }
 
             void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index 09e360a3b87..78ba67004bc 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -24,8 +24,13 @@ SDCategory: Tempest Keep, The Eye
 EndScriptData */
 
 #include "ScriptMgr.h"
+#include "GameObject.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
+#include "ObjectAccessor.h"
 #include "ScriptedCreature.h"
 #include "Spell.h"
+#include "SpellInfo.h"
 #include "SpellScript.h"
 #include "the_eye.h"
 
@@ -864,7 +869,7 @@ class boss_kaelthas : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return GetInstanceAI<boss_kaelthasAI>(creature);
+            return GetTheEyeAI<boss_kaelthasAI>(creature);
         }
 };
 
@@ -969,7 +974,7 @@ class boss_thaladred_the_darkener : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return GetInstanceAI<boss_thaladred_the_darkenerAI>(creature);
+            return GetTheEyeAI<boss_thaladred_the_darkenerAI>(creature);
         }
 };
 
@@ -1033,7 +1038,7 @@ class boss_lord_sanguinar : public CreatureScript
         };
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return GetInstanceAI<boss_lord_sanguinarAI>(creature);
+            return GetTheEyeAI<boss_lord_sanguinarAI>(creature);
         }
 };
 
@@ -1119,7 +1124,7 @@ class boss_grand_astromancer_capernian : public CreatureScript
                 //Conflagration_Timer
                 if (Conflagration_Timer <= diff)
                 {
-                    Unit* target = NULL;
+                    Unit* target = nullptr;
                     target = SelectTarget(SELECT_TARGET_RANDOM, 0);
 
                     if (target && me->IsWithinDistInMap(target, 30))
@@ -1136,8 +1141,8 @@ class boss_grand_astromancer_capernian : public CreatureScript
                 if (ArcaneExplosion_Timer <= diff)
                 {
                     bool InMeleeRange = false;
-                    Unit* target = NULL;
-                    ThreatContainer::StorageType const &threatlist = me->getThreatManager().getThreatList();
+                    Unit* target = nullptr;
+                    ThreatContainer::StorageType const& threatlist = me->getThreatManager().getThreatList();
                     for (ThreatContainer::StorageType::const_iterator i = threatlist.begin(); i!= threatlist.end(); ++i)
                     {
                         Unit* unit = ObjectAccessor::GetUnit(*me, (*i)->getUnitGuid());
@@ -1164,7 +1169,7 @@ class boss_grand_astromancer_capernian : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return GetInstanceAI<boss_grand_astromancer_capernianAI>(creature);
+            return GetTheEyeAI<boss_grand_astromancer_capernianAI>(creature);
         }
 };
 
@@ -1243,7 +1248,7 @@ class boss_master_engineer_telonicus : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return GetInstanceAI<boss_master_engineer_telonicusAI>(creature);
+            return GetTheEyeAI<boss_master_engineer_telonicusAI>(creature);
         }
 };
 
@@ -1313,7 +1318,7 @@ class npc_kael_flamestrike : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return new npc_kael_flamestrikeAI(creature);
+            return GetTheEyeAI<npc_kael_flamestrikeAI>(creature);
         }
 };
 
@@ -1372,7 +1377,7 @@ class npc_phoenix_tk : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return new npc_phoenix_tkAI(creature);
+            return GetTheEyeAI<npc_phoenix_tkAI>(creature);
         }
 };
 
@@ -1438,7 +1443,7 @@ class npc_phoenix_egg_tk : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return new npc_phoenix_egg_tkAI(creature);
+            return GetTheEyeAI<npc_phoenix_egg_tkAI>(creature);
         }
 };
 
@@ -1460,11 +1465,7 @@ class spell_kael_gravity_lapse : public SpellScriptLoader
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
-                for (uint8 i = 0; i < 25; ++i)
-                    if (!sSpellMgr->GetSpellInfo(GravityLapseSpells[i]))
-                        return false;
-
-                return true;
+                return ValidateSpellInfo(GravityLapseSpells);
             }
 
             void HandleScript(SpellEffIndex /*effIndex*/)
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
index c111756aa5c..962228a215a 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "ScriptMgr.h"
+#include "ObjectAccessor.h"
 #include "ScriptedCreature.h"
 #include "the_eye.h"
 
@@ -110,7 +111,7 @@ class boss_void_reaver : public CreatureScript
                             break;
                         case EVENT_ARCANE_ORB:
                         {
-                            Unit* target = NULL;
+                            Unit* target = nullptr;
                             std::list<HostileReference*> t_list = me->getThreatManager().getThreatList();
                             std::vector<Unit*> target_list;
                             for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr != t_list.end(); ++itr)
@@ -121,7 +122,7 @@ class boss_void_reaver : public CreatureScript
                                 // exclude pets & totems, 18 yard radius minimum
                                 if (target->GetTypeId() == TYPEID_PLAYER && target->IsAlive() && !target->IsWithinDist(me, 18, false))
                                     target_list.push_back(target);
-                                target = NULL;
+                                target = nullptr;
                             }
 
                             if (!target_list.empty())
@@ -130,7 +131,7 @@ class boss_void_reaver : public CreatureScript
                                 target = me->GetVictim();
 
                             if (target)
-                                me->CastSpell(target, SPELL_ARCANE_ORB, false, NULL, NULL);
+                                me->CastSpell(target, SPELL_ARCANE_ORB, false, nullptr, nullptr);
 
                             events.ScheduleEvent(EVENT_ARCANE_ORB, 3000);
                             break;
@@ -167,7 +168,7 @@ class boss_void_reaver : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return GetInstanceAI<boss_void_reaverAI>(creature);
+            return GetTheEyeAI<boss_void_reaverAI>(creature);
         }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
index 0d279c928f0..71471909f6b 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
@@ -24,7 +24,9 @@ SDCategory: Tempest Keep, The Eye
 EndScriptData */
 
 #include "ScriptMgr.h"
+#include "Creature.h"
 #include "InstanceScript.h"
+#include "Map.h"
 #include "the_eye.h"
 
 /* The Eye encounters:
@@ -52,7 +54,7 @@ ObjectData const gameObjectData[] =
 class instance_the_eye : public InstanceMapScript
 {
     public:
-        instance_the_eye() : InstanceMapScript("instance_the_eye", 550) { }
+        instance_the_eye() : InstanceMapScript(TheEyeScriptName, 550) { }
 
         struct instance_the_eye_InstanceMapScript : public InstanceScript
         {
@@ -106,13 +108,13 @@ class instance_the_eye : public InstanceMapScript
             {
                 switch (identifier)
                 {
-                case DATA_THALADREDTHEDARKENER:         return ThaladredTheDarkener;
-                case DATA_LORDSANGUINAR:                return LordSanguinar;
-                case DATA_GRANDASTROMANCERCAPERNIAN:    return GrandAstromancerCapernian;
-                case DATA_MASTERENGINEERTELONICUS:      return MasterEngineerTelonicus;
-                case DATA_KAELTHAS:                     return Kaelthas;
-                case DATA_HIGH_ASTROMANCER_SOLARIAN:    return Astromancer;
-                case DATA_ALAR:                         return Alar;
+                    case DATA_THALADREDTHEDARKENER:         return ThaladredTheDarkener;
+                    case DATA_LORDSANGUINAR:                return LordSanguinar;
+                    case DATA_GRANDASTROMANCERCAPERNIAN:    return GrandAstromancerCapernian;
+                    case DATA_MASTERENGINEERTELONICUS:      return MasterEngineerTelonicus;
+                    case DATA_KAELTHAS:                     return Kaelthas;
+                    case DATA_HIGH_ASTROMANCER_SOLARIAN:    return Astromancer;
+                    case DATA_ALAR:                         return Alar;
                 }
                 return ObjectGuid::Empty;
             }
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
index feabaf8e701..1cbb522552c 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
@@ -110,7 +110,7 @@ class npc_crystalcore_devastator : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return new npc_crystalcore_devastatorAI(creature);
+            return GetTheEyeAI<npc_crystalcore_devastatorAI>(creature);
         }
 };
 void AddSC_the_eye()
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
index 1111e2409f5..1ac735f750c 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
+++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
@@ -19,6 +19,9 @@
 #ifndef DEF_THE_EYE_H
 #define DEF_THE_EYE_H
 
+#include "CreatureAIImpl.h"
+
+#define TheEyeScriptName "instance_the_eye"
 #define DataHeader "TE"
 
 uint32 const EncounterCount = 4;
@@ -63,4 +66,10 @@ enum TEGameObjectIds
     GO_ARCANE_DOOR_RIGHT                = 184325
 };
 
+template <class AI, class T>
+inline AI* GetTheEyeAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, TheEyeScriptName);
+}
+
 #endif
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
index b10b6276337..6376a0e8175 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
@@ -23,8 +23,8 @@ SDCategory: Tempest Keep, The Mechanar
 EndScriptData */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
 #include "mechanar.h"
+#include "ScriptedCreature.h"
 
 enum Say
 {
@@ -120,7 +120,7 @@ class boss_gatewatcher_gyrokill : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return new boss_gatewatcher_gyrokillAI(creature);
+            return GetMechanarAI<boss_gatewatcher_gyrokillAI>(creature);
         }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
index 1733d94bc78..0b060d35771 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
@@ -24,8 +24,8 @@ SDCategory: Tempest Keep, The Mechanar
 EndScriptData */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
 #include "mechanar.h"
+#include "ScriptedCreature.h"
 
 enum Says
 {
@@ -127,7 +127,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return new boss_gatewatcher_iron_handAI(creature);
+            return GetMechanarAI<boss_gatewatcher_iron_handAI>(creature);
         }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
index 19036555787..4d804355423 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
@@ -16,10 +16,11 @@
  */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
-#include "SpellScript.h"
 #include "mechanar.h"
 #include "Player.h"
+#include "ScriptedCreature.h"
+#include "SpellInfo.h"
+#include "SpellScript.h"
 
 enum Spells
 {
@@ -155,7 +156,7 @@ class boss_mechano_lord_capacitus : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return new boss_mechano_lord_capacitusAI(creature);
+            return GetMechanarAI<boss_mechano_lord_capacitusAI>(creature);
         }
 };
 
@@ -170,15 +171,13 @@ class spell_capacitus_polarity_charge : public SpellScriptLoader
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
-                if (!sSpellMgr->GetSpellInfo(SPELL_POSITIVE_CHARGE))
-                    return false;
-                if (!sSpellMgr->GetSpellInfo(SPELL_POSITIVE_CHARGE_STACK))
-                    return false;
-                if (!sSpellMgr->GetSpellInfo(SPELL_NEGATIVE_CHARGE))
-                    return false;
-                if (!sSpellMgr->GetSpellInfo(SPELL_NEGATIVE_CHARGE_STACK))
-                    return false;
-                return true;
+                return ValidateSpellInfo(
+                {
+                    SPELL_POSITIVE_CHARGE,
+                    SPELL_POSITIVE_CHARGE_STACK,
+                    SPELL_NEGATIVE_CHARGE,
+                    SPELL_NEGATIVE_CHARGE_STACK
+                });
             }
 
             void HandleTargets(std::list<WorldObject*>& targetList)
@@ -238,9 +237,7 @@ class spell_capacitus_polarity_shift : public SpellScriptLoader
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
-                if (!sSpellMgr->GetSpellInfo(SPELL_POSITIVE_POLARITY) || !sSpellMgr->GetSpellInfo(SPELL_NEGATIVE_POLARITY))
-                    return false;
-                return true;
+                return ValidateSpellInfo({ SPELL_POSITIVE_POLARITY, SPELL_NEGATIVE_POLARITY });
             }
 
             void HandleDummy(SpellEffIndex /* effIndex */)
@@ -248,7 +245,7 @@ class spell_capacitus_polarity_shift : public SpellScriptLoader
                 Unit* target = GetHitUnit();
                 Unit* caster = GetCaster();
 
-                target->CastSpell(target, roll_chance_i(50) ? SPELL_POSITIVE_POLARITY : SPELL_NEGATIVE_POLARITY, true, NULL, NULL, caster->GetGUID());
+                target->CastSpell(target, roll_chance_i(50) ? SPELL_POSITIVE_POLARITY : SPELL_NEGATIVE_POLARITY, true, nullptr, nullptr, caster->GetGUID());
             }
 
             void Register() override
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
index 483cf3284c3..15f70ada7a7 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
@@ -24,8 +24,10 @@ SDCategory: Tempest Keep, The Mechanar
 EndScriptData */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
+#include "InstanceScript.h"
 #include "mechanar.h"
+#include "MotionMaster.h"
+#include "ScriptedCreature.h"
 
 enum Says
 {
@@ -141,7 +143,7 @@ class boss_nethermancer_sepethrea : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return new boss_nethermancer_sepethreaAI(creature);
+            return GetMechanarAI<boss_nethermancer_sepethreaAI>(creature);
         }
 };
 
@@ -229,7 +231,7 @@ class npc_ragin_flames : public CreatureScript
             };
             CreatureAI* GetAI(Creature* creature) const override
             {
-                return GetInstanceAI<npc_ragin_flamesAI>(creature);
+                return GetMechanarAI<npc_ragin_flamesAI>(creature);
             }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
index 9ddca823d9e..25bbfe0392a 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
@@ -24,8 +24,9 @@ SDCategory: Tempest Keep, The Mechanar
 EndScriptData */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
 #include "mechanar.h"
+#include "ScriptedCreature.h"
+#include "TemporarySummon.h"
 
 enum Says
 {
@@ -163,7 +164,7 @@ class boss_pathaleon_the_calculator : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return new boss_pathaleon_the_calculatorAI(creature);
+            return GetMechanarAI<boss_pathaleon_the_calculatorAI>(creature);
         }
 };
 
@@ -243,7 +244,7 @@ class npc_nether_wraith : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return new npc_nether_wraithAI(creature);
+            return GetMechanarAI<npc_nether_wraithAI>(creature);
         }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
index 47587cf528e..5b5c2beb7dd 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
@@ -18,20 +18,21 @@
 
 #include "ScriptMgr.h"
 #include "InstanceScript.h"
+#include "Map.h"
 #include "mechanar.h"
 
 static DoorData const doorData[] =
 {
     { GO_DOOR_MOARG_1,          DATA_GATEWATCHER_IRON_HAND,     DOOR_TYPE_PASSAGE },
     { GO_DOOR_MOARG_2,          DATA_GATEWATCHER_GYROKILL,      DOOR_TYPE_PASSAGE },
-    { GO_DOOR_NETHERMANCER,     DATA_NETHERMANCER_SEPRETHREA,   DOOR_TYPE_ROOM },
-    { 0,                        0,                              DOOR_TYPE_ROOM }
+    { GO_DOOR_NETHERMANCER,     DATA_NETHERMANCER_SEPRETHREA,   DOOR_TYPE_ROOM    },
+    { 0,                        0,                              DOOR_TYPE_ROOM    }
 };
 
 class instance_mechanar : public InstanceMapScript
 {
     public:
-        instance_mechanar(): InstanceMapScript("instance_mechanar", 554) { }
+        instance_mechanar(): InstanceMapScript(MechanarScriptName, 554) { }
 
         struct instance_mechanar_InstanceMapScript : public InstanceScript
         {
@@ -42,34 +43,6 @@ class instance_mechanar : public InstanceMapScript
                 LoadDoorData(doorData);
             }
 
-            void OnGameObjectCreate(GameObject* gameObject) override
-            {
-                switch (gameObject->GetEntry())
-                {
-                    case GO_DOOR_MOARG_1:
-                    case GO_DOOR_MOARG_2:
-                    case GO_DOOR_NETHERMANCER:
-                        AddDoor(gameObject, true);
-                        break;
-                    default:
-                        break;
-                }
-            }
-
-            void OnGameObjectRemove(GameObject* gameObject) override
-            {
-                switch (gameObject->GetEntry())
-                {
-                    case GO_DOOR_MOARG_1:
-                    case GO_DOOR_MOARG_2:
-                    case GO_DOOR_NETHERMANCER:
-                        AddDoor(gameObject, false);
-                        break;
-                    default:
-                        break;
-                }
-            }
-
             bool SetBossState(uint32 type, EncounterState state) override
             {
                 if (!InstanceScript::SetBossState(type, state))
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h b/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h
index 35494c745f8..b4edfd9c74e 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h
@@ -18,6 +18,9 @@
 #ifndef DEF_MECHANAR_H
 #define DEF_MECHANAR_H
 
+#include "CreatureAIImpl.h"
+
+#define MechanarScriptName "instance_mechanar"
 #define DataHeader "MR"
 
 uint32 const EncounterCount             = 5;
@@ -38,4 +41,10 @@ enum MRGameobjectIds
     GO_DOOR_NETHERMANCER                = 184449
 };
 
+template <class AI, class T>
+inline AI* GetMechanarAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, MechanarScriptName);
+}
+
 #endif
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
index 6c469601efc..d571c155dbe 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
@@ -30,8 +30,10 @@ npc_zerekethvoidzone
 EndContentData */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
 #include "arcatraz.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
+#include "ScriptedCreature.h"
 
 /*#####
 # npc_millhouse_manastorm
@@ -549,7 +551,7 @@ class npc_zerekethvoidzone : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return new npc_zerekethvoidzoneAI(creature);
+            return GetArcatrazAI<npc_zerekethvoidzoneAI>(creature);
         }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
index 038dfb16067..2ccf1684860 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
@@ -18,6 +18,8 @@
 #ifndef ARCATRAZ_H
 #define ARCATRAZ_H
 
+#include "CreatureAIImpl.h"
+
 #define ArcatrazScriptName "instance_arcatraz"
 #define DataHeader         "AZ"
 
@@ -62,10 +64,10 @@ enum AZGameObjectIds
     GO_WARDENS_SHIELD                           = 184802  // shield 'protecting' mellichar
 };
 
-template<class AI>
-AI* GetArcatrazAI(Creature* creature)
+template <class AI, class T>
+inline AI* GetArcatrazAI(T* obj)
 {
-    return GetInstanceAI<AI>(creature, ArcatrazScriptName);
+    return GetInstanceAI<AI>(obj, ArcatrazScriptName);
 }
 
 #endif // ARCATRAZ_H
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
index 52481ac629d..e2235a34c3c 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
@@ -16,8 +16,10 @@
  */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
 #include "arcatraz.h"
+#include "InstanceScript.h"
+#include "ObjectAccessor.h"
+#include "ScriptedCreature.h"
 
 enum Say
 {
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
index 763d0c206cc..564bb6b2d9c 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
@@ -29,8 +29,10 @@ boss_harbinger_skyriss_illusion
 EndContentData */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
 #include "arcatraz.h"
+#include "InstanceScript.h"
+#include "ObjectAccessor.h"
+#include "ScriptedCreature.h"
 
 enum Says
 {
@@ -293,7 +295,7 @@ class boss_harbinger_skyriss_illusion : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return new boss_harbinger_skyriss_illusionAI(creature);
+            return GetArcatrazAI<boss_harbinger_skyriss_illusionAI>(creature);
         }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
index 4f12a669a6a..561dbaa8c5a 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
@@ -23,8 +23,11 @@ SDCategory: Tempest Keep, The Arcatraz
 EndScriptData */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
 #include "arcatraz.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
+#include "ObjectAccessor.h"
+#include "ScriptedCreature.h"
 
 enum Say
 {
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
index 54693d3776a..bb21b999d5d 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
@@ -118,7 +118,7 @@ class boss_zereketh_the_unbound : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return new boss_zereketh_the_unboundAI(creature);
+            return GetArcatrazAI<boss_zereketh_the_unboundAI>(creature);
         }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
index b79274d3b5d..ba5b7b7e0a5 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
@@ -16,8 +16,11 @@
  */
 
 #include "ScriptMgr.h"
-#include "InstanceScript.h"
 #include "arcatraz.h"
+#include "Creature.h"
+#include "GameObject.h"
+#include "InstanceScript.h"
+#include "Map.h"
 
 DoorData const doorData[] =
 {
@@ -64,12 +67,10 @@ class instance_arcatraz : public InstanceMapScript
 
             void OnGameObjectCreate(GameObject* go) override
             {
+                InstanceScript::OnGameObjectCreate(go);
+
                 switch (go->GetEntry())
                 {
-                    case GO_CONTAINMENT_CORE_SECURITY_FIELD_ALPHA:
-                    case GO_CONTAINMENT_CORE_SECURITY_FIELD_BETA:
-                        AddDoor(go, true);
-                        break;
                     case GO_STASIS_POD_ALPHA:
                         StasisPodGUIDs[0] = go->GetGUID();
                         break;
@@ -93,19 +94,6 @@ class instance_arcatraz : public InstanceMapScript
                 }
             }
 
-            void OnGameObjectRemove(GameObject* go) override
-            {
-                switch (go->GetEntry())
-                {
-                    case GO_CONTAINMENT_CORE_SECURITY_FIELD_ALPHA:
-                    case GO_CONTAINMENT_CORE_SECURITY_FIELD_BETA:
-                        AddDoor(go, false);
-                        break;
-                    default:
-                        break;
-                }
-            }
-
             void SetData(uint32 type, uint32 data) override
             {
                 switch (type)
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
index ad83bd90e61..48c2d0dadad 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
@@ -16,9 +16,10 @@
  */
 
 #include "ScriptMgr.h"
+#include "Map.h"
 #include "ScriptedCreature.h"
-#include "the_botanica.h"
 #include "SpellScript.h"
+#include "the_botanica.h"
 
 enum Says
 {
@@ -142,7 +143,7 @@ class boss_commander_sarannis : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return new boss_commander_sarannisAI(creature);
+            return GetBotanicaAI<boss_commander_sarannisAI>(creature);
         }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
index 91de750ad81..204a52609b0 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
@@ -24,6 +24,8 @@ SDCategory: Tempest Keep, The Botanica
 EndScriptData */
 
 #include "ScriptMgr.h"
+#include "MotionMaster.h"
+#include "ObjectAccessor.h"
 #include "ScriptedCreature.h"
 #include "the_botanica.h"
 
@@ -210,7 +212,7 @@ class boss_high_botanist_freywinn : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return new boss_high_botanist_freywinnAI(creature);
+            return GetBotanicaAI<boss_high_botanist_freywinnAI>(creature);
         }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
index e8283eeb8cb..31241a050dd 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
@@ -223,7 +223,7 @@ class boss_laj : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return new boss_lajAI(creature);
+            return GetBotanicaAI<boss_lajAI>(creature);
         }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
index 6480b8a2b58..67a27523d99 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
@@ -152,7 +152,7 @@ class boss_thorngrin_the_tender : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return new boss_thorngrin_the_tenderAI(creature);
+            return GetBotanicaAI<boss_thorngrin_the_tenderAI>(creature);
         }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
index 6980ca054e9..291be813dc1 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
@@ -24,7 +24,10 @@ SDCategory: Tempest Keep, The Botanica
 EndScriptData */
 
 #include "ScriptMgr.h"
+#include "MotionMaster.h"
+#include "ObjectAccessor.h"
 #include "ScriptedCreature.h"
+#include "TemporarySummon.h"
 #include "the_botanica.h"
 
 enum Says
@@ -94,7 +97,6 @@ class npc_warp_splinter_treant : public CreatureScript
 
             void MoveInLineOfSight(Unit* /*who*/) override { }
 
-
             void UpdateAI(uint32 diff) override
             {
                 if (!UpdateVictim() || !me->GetVictim())
@@ -107,7 +109,7 @@ class npc_warp_splinter_treant : public CreatureScript
                             {
                                 int32 CurrentHP_Treant = (int32)me->GetHealth();
                                 Warp->CastCustomSpell(Warp, SPELL_HEAL_FATHER, &CurrentHP_Treant, 0, 0, true, 0, 0, me->GetGUID());
-                                me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                                me->DealDamage(me, me->GetHealth(), nullptr, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, nullptr, false);
                                 return;
                             }
                             me->GetMotionMaster()->MoveFollow(Warp, 0, 0);
@@ -125,7 +127,7 @@ class npc_warp_splinter_treant : public CreatureScript
         };
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return new npc_warp_splinter_treantAI(creature);
+            return GetBotanicaAI<npc_warp_splinter_treantAI>(creature);
         }
 };
 
@@ -239,7 +241,7 @@ class boss_warp_splinter : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return new boss_warp_splinterAI(creature);
+            return GetBotanicaAI<boss_warp_splinterAI>(creature);
         }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
index 3d878bae81e..6e092b743f3 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
@@ -16,13 +16,15 @@
  */
 
 #include "ScriptMgr.h"
+#include "Creature.h"
 #include "InstanceScript.h"
+#include "Map.h"
 #include "the_botanica.h"
 
 class instance_the_botanica : public InstanceMapScript
 {
     public:
-        instance_the_botanica() : InstanceMapScript("instance_the_botanica", 553) { }
+        instance_the_botanica() : InstanceMapScript(BotanicaScriptName, 553) { }
 
         struct instance_the_botanica_InstanceMapScript : public InstanceScript
         {
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h b/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h
index fc773d0b133..55a4be28e33 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h
+++ b/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h
@@ -19,6 +19,9 @@
 #ifndef DEF_THE_BOTANICA_H
 #define DEF_THE_BOTANICA_H
 
+#include "CreatureAIImpl.h"
+
+#define BotanicaScriptName "instance_the_botanica"
 #define DataHeader "BC"
 
 uint32 const EncounterCount = 5;
@@ -41,4 +44,10 @@ enum BCCreatureIds
     NPC_WARP_SPLINTER                   = 17977
 };
 
+template <class AI, class T>
+inline AI* GetBotanicaAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, BotanicaScriptName);
+}
+
 #endif