feat(Core/Instance): Add instance validation for creature scripts (#4596)

2026-01-22 21:26:23 +00:00 · 2021-04-05 15:34:26 +02:00
parent 60f865fce6
commit f9d708b450
371 changed files with 1315 additions and 767 deletions
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/auchenai_crypts.h
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/auchenai_crypts.h
@@ -1,18 +1,6 @@
 /*
+ * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
 * Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #ifndef AUCHENAI_CRYPTS_H_
@@ -32,4 +20,10 @@ enum ACDataTypes
    DATA_EXARCH_MALADAAR            = 1
 };

+template <class AI, class T>
+inline AI* GetAuchenaiCryptsAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, ACScriptName);
+}
+
 #endif // AUCHENAI_CRYPTS_H_
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
@@ -2,6 +2,7 @@
 * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
 */

+#include "auchenai_crypts.h"
 #include "ScriptedCreature.h"
 #include "ScriptMgr.h"

@@ -35,7 +36,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_exarch_maladaarAI (creature);
+        return GetAuchenaiCryptsAI<boss_exarch_maladaarAI>(creature);
    }

    struct boss_exarch_maladaarAI : public ScriptedAI
@@ -162,7 +163,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new npc_stolen_soulAI (creature);
+        return GetAuchenaiCryptsAI<npc_stolen_soulAI>(creature);
    }

    struct npc_stolen_soulAI : public ScriptedAI
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
@@ -2,6 +2,7 @@
 * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
 */

+#include "auchenai_crypts.h"
 #include "Player.h"
 #include "ScriptedCreature.h"
 #include "ScriptMgr.h"
@@ -39,7 +40,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_shirrak_the_dead_watcherAI (creature);
+        return GetAuchenaiCryptsAI<boss_shirrak_the_dead_watcherAI>(creature);
    }

    struct boss_shirrak_the_dead_watcherAI : public ScriptedAI
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
@@ -5,6 +5,7 @@
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "Player.h"
+#include "mana_tombs.h"

 enum ePrince
 {
@@ -38,7 +39,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_nexusprince_shaffarAI (creature);
+        return GetManaTombsAI<boss_nexusprince_shaffarAI>(creature);
    }

    struct boss_nexusprince_shaffarAI : public ScriptedAI
@@ -167,7 +168,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new npc_yorAI(creature);
+        return GetManaTombsAI<npc_yorAI>(creature);
    }

    struct npc_yorAI : public ScriptedAI
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
@@ -4,6 +4,7 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

+#include "mana_tombs.h"
 #include "Player.h"
 #include "ScriptedCreature.h"
 #include "ScriptMgr.h"
@@ -35,7 +36,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_pandemoniusAI(creature);
+        return GetManaTombsAI<boss_pandemoniusAI>(creature);
    }

    struct boss_pandemoniusAI : public ScriptedAI
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/mana_tombs.h
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/mana_tombs.h
@@ -34,4 +34,10 @@ enum MTDataTypes
    DATA_YOR                    = 3
 };

+template <class AI, class T>
+inline AI* GetManaTombsAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, MTScriptName);
+}
+
 #endif // MANA_TOMBS_H_
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
@@ -42,7 +42,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_talon_king_ikissAI (creature);
+        return GetSethekkHallsAI<boss_talon_king_ikissAI>(creature);
    }

    struct boss_talon_king_ikissAI : public ScriptedAI
@@ -178,7 +178,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_anzuAI (creature);
+        return GetSethekkHallsAI<boss_anzuAI>(creature);
    }

    struct boss_anzuAI : public ScriptedAI
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
@@ -5,6 +5,10 @@
 #ifndef DEF_SETHEKK_HALLS_H
 #define DEF_SETHEKK_HALLS_H

+#include "CreatureAIImpl.h"
+
+#define SethekkHallsScriptName "instance_sethekk_halls"
+
 enum eTypes
 {
    DATA_IKISSDOOREVENT = 1,
@@ -20,4 +24,10 @@ enum eIds
    GO_THE_TALON_KINGS_COFFER   = 187372
 };

+template <class AI, class T>
+inline AI* GetSethekkHallsAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, SethekkHallsScriptName);
+}
+
 #endif
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
@@ -32,7 +32,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_ambassador_hellmawAI(creature);
+        return GetShadowLabyrinthAI<boss_ambassador_hellmawAI>(creature);
    }

    struct boss_ambassador_hellmawAI : public npc_escortAI
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
@@ -32,7 +32,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_blackheart_the_inciterAI (creature);
+        return GetShadowLabyrinthAI<boss_blackheart_the_inciterAI>(creature);
    }

    struct boss_blackheart_the_inciterAI : public ScriptedAI
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
@@ -55,7 +55,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_grandmaster_vorpilAI (creature);
+        return GetShadowLabyrinthAI<boss_grandmaster_vorpilAI>(creature);
    }

    struct boss_grandmaster_vorpilAI : public ScriptedAI
@@ -201,7 +201,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new npc_voidtravelerAI (creature);
+        return GetShadowLabyrinthAI<npc_voidtravelerAI>(creature);
    }

    struct npc_voidtravelerAI : public ScriptedAI
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
@@ -39,7 +39,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_murmurAI (creature);
+        return GetShadowLabyrinthAI<boss_murmurAI>(creature);
    }

    struct boss_murmurAI : public ScriptedAI
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
@@ -6,9 +6,12 @@
 #define DEF_SHADOW_LABYRINTH_H

 #include "CreatureAI.h"
+#include "CreatureAIImpl.h"
 #include "GridNotifiers.h"
 #include "SpellScript.h"

+#define ShadowLabyrinthScriptName "instance_shadow_labyrinth"
+
 enum slData
 {
    TYPE_OVERSEER                   = 0,
@@ -28,4 +31,10 @@ enum slNPCandGO
    SCREAMING_HALL_DOOR         = 183295                      //door opened when grandmaster vorpil dies
 };

+template <class AI, class T>
+inline AI* GetShadowLabyrinthAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, ShadowLabyrinthScriptName);
+}
+
 #endif
--- a/src/server/scripts/Outland/BlackTemple/black_temple.h
+++ b/src/server/scripts/Outland/BlackTemple/black_temple.h
@@ -5,6 +5,7 @@
 #ifndef BLACK_TEMPLE_H_
 #define BLACK_TEMPLE_H_

+#include "CreatureAIImpl.h"
 #include "GridNotifiers.h"
 #include "PassiveAI.h"
 #include "Player.h"
@@ -12,6 +13,8 @@
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"

+#define BlackTempleScriptName "instance_black_temple"
+
 enum DataTypes
 {
    DATA_HIGH_WARLORD_NAJENTUS      = 0,
@@ -83,4 +86,10 @@ enum MiscIds
    FACTION_ASHTONGUE               = 1820
 };

+template <class AI, class T>
+inline AI* GetBlackTempleAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, BlackTempleScriptName);
+}
+
 #endif // BLACK_TEMPLE_H_
--- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
@@ -65,7 +65,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_gurtogg_bloodboilAI>(creature);
+        return GetBlackTempleAI<boss_gurtogg_bloodboilAI>(creature);
    }

    struct boss_gurtogg_bloodboilAI : public BossAI
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -696,7 +696,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_illidan_stormrageAI>(creature);
+        return GetBlackTempleAI<boss_illidan_stormrageAI>(creature);
    }
 };

@@ -979,7 +979,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<npc_akama_illidanAI>(creature);
+        return GetBlackTempleAI<npc_akama_illidanAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
@@ -60,7 +60,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_shahrazAI>(creature);
+        return GetBlackTempleAI<boss_shahrazAI>(creature);
    }

    struct boss_shahrazAI : public BossAI
--- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
@@ -124,7 +124,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_reliquary_of_soulsAI>(creature);
+        return GetBlackTempleAI<boss_reliquary_of_soulsAI>(creature);
    }

    struct boss_reliquary_of_soulsAI : public BossAI
@@ -255,7 +255,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_essence_of_sufferingAI(creature);
+        return GetBlackTempleAI<boss_essence_of_sufferingAI>(creature);
    }

    struct boss_essence_of_sufferingAI : public ScriptedAI
@@ -366,7 +366,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_essence_of_desireAI(creature);
+        return GetBlackTempleAI<boss_essence_of_desireAI>(creature);
    }

    struct boss_essence_of_desireAI : public ScriptedAI
@@ -475,7 +475,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_essence_of_angerAI(creature);
+        return GetBlackTempleAI<boss_essence_of_angerAI>(creature);
    }

    struct boss_essence_of_angerAI : public ScriptedAI
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -256,7 +256,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_shade_of_akamaAI>(creature);
+        return GetBlackTempleAI<boss_shade_of_akamaAI>(creature);
    }
 };

@@ -420,7 +420,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<npc_akamaAI>(creature);
+        return GetBlackTempleAI<npc_akamaAI>(creature);
    }
 };

@@ -540,7 +540,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<npc_creature_generator_akamaAI>(creature);
+        return GetBlackTempleAI<npc_creature_generator_akamaAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
@@ -40,7 +40,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_supremusAI>(creature);
+        return GetBlackTempleAI<boss_supremusAI>(creature);
    }

    struct boss_supremusAI : public BossAI
--- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
@@ -64,7 +64,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_teron_gorefiendAI>(creature);
+        return GetBlackTempleAI<boss_teron_gorefiendAI>(creature);
    }

    struct boss_teron_gorefiendAI : public BossAI
--- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
@@ -44,7 +44,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_najentusAI>(creature);
+        return GetBlackTempleAI<boss_najentusAI>(creature);
    }

    struct boss_najentusAI : public BossAI
--- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
+++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
@@ -126,7 +126,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_illidari_councilAI>(creature);
+        return GetBlackTempleAI<boss_illidari_councilAI>(creature);
    }

    struct boss_illidari_councilAI : public BossAI
@@ -269,7 +269,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_gathios_the_shattererAI>(creature);
+        return GetBlackTempleAI<boss_gathios_the_shattererAI>(creature);
    }

    struct boss_gathios_the_shattererAI : public boss_illidari_council_memberAI
@@ -357,7 +357,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_high_nethermancer_zerevorAI>(creature);
+        return GetBlackTempleAI<boss_high_nethermancer_zerevorAI>(creature);
    }

    struct boss_high_nethermancer_zerevorAI : public boss_illidari_council_memberAI
@@ -430,7 +430,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_lady_malandeAI>(creature);
+        return GetBlackTempleAI<boss_lady_malandeAI>(creature);
    }

    struct boss_lady_malandeAI : public boss_illidari_council_memberAI
@@ -494,7 +494,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_veras_darkshadowAI>(creature);
+        return GetBlackTempleAI<boss_veras_darkshadowAI>(creature);
    }

    struct boss_veras_darkshadowAI : public boss_illidari_council_memberAI
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
@@ -57,7 +57,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_fathomlord_karathressAI>(creature);
+        return GetSerpentShrineAI<boss_fathomlord_karathressAI>(creature);
    }

    struct boss_fathomlord_karathressAI : public BossAI
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
@@ -83,7 +83,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_hydross_the_unstableAI>(creature);
+        return GetSerpentShrineAI<boss_hydross_the_unstableAI>(creature);
    }

    struct boss_hydross_the_unstableAI : public BossAI
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
@@ -91,7 +91,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_lady_vashjAI>(creature);
+        return GetSerpentShrineAI<boss_lady_vashjAI>(creature);
    }

    struct boss_lady_vashjAI : public BossAI
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
@@ -74,7 +74,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_leotheras_the_blindAI>(creature);
+        return GetSerpentShrineAI<boss_leotheras_the_blindAI>(creature);
    }

    struct boss_leotheras_the_blindAI : public BossAI
@@ -264,7 +264,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new npc_inner_demonAI(creature);
+        return GetSerpentShrineAI<npc_inner_demonAI>(creature);
    }

    struct npc_inner_demonAI : public ScriptedAI
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
@@ -53,7 +53,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_the_lurker_belowAI>(creature);
+        return GetSerpentShrineAI<boss_the_lurker_belowAI>(creature);
    }

    struct boss_the_lurker_belowAI : public BossAI
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
@@ -57,7 +57,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_morogrim_tidewalkerAI>(creature);
+        return GetSerpentShrineAI<boss_morogrim_tidewalkerAI>(creature);
    }

    struct boss_morogrim_tidewalkerAI : public BossAI
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
@@ -6,11 +6,14 @@
 #define DEF_SERPENT_SHRINE_H

 #include "CreatureAI.h"
+#include "CreatureAIImpl.h"
 #include "GridNotifiers.h"
 #include "Player.h"
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"

+#define SerpentShrineScriptName "instance_serpent_shrine"
+
 enum DataTypes
 {
    DATA_HYDROSS_THE_UNSTABLE               = 0,
@@ -65,4 +68,10 @@ enum SSSpells
    SPELL_FRENZY_WATER                      = 37026
 };

+template <class AI, class T>
+inline AI* GetSerpentShrineAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, SerpentShrineScriptName);
+}
+
 #endif
--- a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp
@@ -9,6 +9,7 @@
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "ScriptMgr.h"
+#include "the_slave_pens.h"

 #define GOSSIP_TEXT_ID          15864
 #define QUEST_SUMMON_AHUNE      11691
@@ -21,17 +22,6 @@ const Position AhuneSummonPos = {-97.3473f, -233.139f, -1.27587f, M_PI / 2};
 const Position TotemPos[3] = { {-115.141f, -143.317f, -2.09467f, 4.92772f}, {-120.178f, -144.398f, -2.23786f, 4.92379f}, {-125.277f, -145.463f, -1.95209f, 4.97877f} };
 const Position MinionSummonPos = {-97.154404f, -204.382675f, -1.19f, M_PI / 2};

-enum NPCs
-{
-    NPC_AHUNE                   = 25740,
-    NPC_FROZEN_CORE             = 25865,
-    NPC_AHUNE_SUMMON_LOC_BUNNY  = 25745,
-    NPC_TOTEM                   = 25961,
-    NPC_TOTEM_BUNNY_1           = 25971,
-    NPC_TOTEM_BUNNY_2           = 25972,
-    NPC_TOTEM_BUNNY_3           = 25973,
-};
-
 enum EventSpells
 {
    SPELL_STARTING_BEAM         = 46593,
@@ -81,7 +71,7 @@ public:

    CreatureAI* GetAI(Creature* pCreature) const override
    {
-        return new boss_ahuneAI (pCreature);
+        return GetTheSlavePensAI<boss_ahuneAI>(pCreature);
    }

    struct boss_ahuneAI : public ScriptedAI
@@ -360,7 +350,7 @@ public:

    CreatureAI* GetAI(Creature* pCreature) const override
    {
-        return new npc_ahune_frozen_coreAI (pCreature);
+        return GetTheSlavePensAI<npc_ahune_frozen_coreAI>(pCreature);
    }

    struct npc_ahune_frozen_coreAI : public NullCreatureAI
--- a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/the_slave_pens.h
+++ b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/the_slave_pens.h
@@ -1,18 +1,6 @@
 /*
+ * Copyright (C) 2016+     AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
 * Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #ifndef SLAVE_PENS_H
@@ -49,6 +37,11 @@ enum SPCreaturesIds
 {
    NPC_AHUNE                            = 25740,
    NPC_FROZEN_CORE                      = 25865,
+    NPC_AHUNE_SUMMON_LOC_BUNNY           = 25745,
+    NPC_TOTEM                            = 25961,
+    NPC_TOTEM_BUNNY_1                    = 25971,
+    NPC_TOTEM_BUNNY_2                    = 25972,
+    NPC_TOTEM_BUNNY_3                    = 25973,
    NPC_LUMA_SKYMOTHER                   = 25697,
    NPC_AHUNE_LOC_BUNNY                  = 25745,
    NPC_EARTHEN_RING_FLAMECALLER         = 25754,
@@ -68,4 +61,10 @@ enum SPGameObjectIds
    GO_ICE_STONE                         = 187882
 };

+template <class AI, class T>
+inline AI* GetTheSlavePensAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, SPScriptName);
+}
+
 #endif // SLAVE_PENS_H
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
@@ -29,7 +29,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_thespiaAI (creature);
+        return GetSteamVaultAI<boss_thespiaAI>(creature);
    }

    struct boss_thespiaAI : public ScriptedAI
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
@@ -36,7 +36,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_mekgineer_steamriggerAI (creature);
+        return GetSteamVaultAI<boss_mekgineer_steamriggerAI>(creature);
    }

    struct boss_mekgineer_steamriggerAI : public ScriptedAI
@@ -147,7 +147,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new npc_steamrigger_mechanicAI (creature);
+        return GetSteamVaultAI<npc_steamrigger_mechanicAI>(creature);
    }

    struct npc_steamrigger_mechanicAI : public ScriptedAI
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
@@ -35,7 +35,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_warlord_kalithreshAI (creature);
+        return GetSteamVaultAI<boss_warlord_kalithreshAI>(creature);
    }

    struct boss_warlord_kalithreshAI : public ScriptedAI
@@ -119,7 +119,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new npc_naga_distillerAI (creature);
+        return GetSteamVaultAI<npc_naga_distillerAI>(creature);
    }

    struct npc_naga_distillerAI : public NullCreatureAI
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
@@ -6,6 +6,9 @@
 #define DEF_STEAM_VAULT_H

 #include "PassiveAI.h"
+#include "CreatureAIImpl.h"
+
+#define SteamVaultScriptName "instance_steam_vault"

 enum steamVault
 {
@@ -25,4 +28,10 @@ enum steamVaultNPCGO
    NPC_WARLORD_KALITHRESH              = 17798,
 };

+template <class AI, class T>
+inline AI* GetSteamVaultAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, SteamVaultScriptName);
+}
+
 #endif
--- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
@@ -14,6 +14,7 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "ScriptMgr.h"
 #include "SpellScript.h"
+#include "the_underbog.h"

 enum eBlackStalker
 {
@@ -43,7 +44,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_the_black_stalkerAI (creature);
+        return GetTheUnderbogAI<boss_the_black_stalkerAI>(creature);
    }

    struct boss_the_black_stalkerAI : public ScriptedAI
--- a/src/server/scripts/Outland/CoilfangReservoir/underbog/instance_the_underbog.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/instance_the_underbog.cpp
@@ -30,7 +30,7 @@ gets instead the deserter debuff.
 class instance_the_underbog : public InstanceMapScript
 {
 public:
-    instance_the_underbog() : InstanceMapScript(TheUndebogScriptName, 546) { }
+    instance_the_underbog() : InstanceMapScript(TheUnderbogScriptName, 546) { }

    InstanceScript* GetInstanceScript(InstanceMap* map) const override
    {
--- a/src/server/scripts/Outland/CoilfangReservoir/underbog/the_underbog.h
+++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/the_underbog.h
@@ -1,18 +1,6 @@
 /*
+ * Copyright (C) 2016+     AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
 * Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #ifndef the_underbog_h__
@@ -20,6 +8,12 @@

 #include "CreatureAIImpl.h"

-#define TheUndebogScriptName "instance_the_underbog"
+#define TheUnderbogScriptName "instance_the_underbog"
+
+template <class AI, class T>
+inline AI* GetTheUnderbogAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, TheUnderbogScriptName);
+}

 #endif // the_underbog_h__
--- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
@@ -149,7 +149,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_gruulAI>(creature);
+        return GetGruulsLairAI<boss_gruulAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
@@ -173,7 +173,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_high_king_maulgarAI>(creature);
+        return GetGruulsLairAI<boss_high_king_maulgarAI>(creature);
    }
 };

@@ -261,7 +261,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_olm_the_summonerAI>(creature);
+        return GetGruulsLairAI<boss_olm_the_summonerAI>(creature);
    }
 };

@@ -339,7 +339,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_kiggler_the_crazedAI>(creature);
+        return GetGruulsLairAI<boss_kiggler_the_crazedAI>(creature);
    }
 };

@@ -411,7 +411,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_blindeye_the_seerAI>(creature);
+        return GetGruulsLairAI<boss_blindeye_the_seerAI>(creature);
    }
 };

@@ -491,7 +491,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_krosh_firehandAI>(creature);
+        return GetGruulsLairAI<boss_krosh_firehandAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h
+++ b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h
@@ -6,8 +6,11 @@
 #define GRUULS_LAIR_H_

 #include "CreatureAI.h"
+#include "CreatureAIImpl.h"
 #include "SpellAuraEffects.h"

+#define GruulsLairScriptName "instance_gruuls_lair"
+
 enum DataTypes
 {
    DATA_MAULGAR                = 0,
@@ -33,4 +36,10 @@ enum GameObjectIds
    GO_GRUUL_DOOR               = 184662
 };

+template <class AI, class T>
+inline AI* GetGruulsLairAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, GruulsLairScriptName);
+}
+
 #endif // GRUULS_LAIR_H_
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
@@ -6,6 +6,9 @@
 #define DEF_BLOOD_FURNACE_H

 #include "Player.h"
+#include "CreatureAIImpl.h"
+
+#define BloodFurnaceScriptName "instance_blood_furnace"

 enum bloodFurnace
 {
@@ -39,4 +42,10 @@ enum bloodFurnaceNPC
    NPC_CHANNELER                       = 17653
 };

+template <class AI, class T>
+inline AI* GetBloodFurnaceAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, BloodFurnaceScriptName);
+}
+
 #endif
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
@@ -126,7 +126,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_broggokAI(creature);
+        return GetBloodFurnaceAI<boss_broggokAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
@@ -265,7 +265,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_kelidan_the_breakerAI(creature);
+        return GetBloodFurnaceAI<boss_kelidan_the_breakerAI>(creature);
    }
 };

@@ -336,7 +336,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new npc_shadowmoon_channelerAI(creature);
+        return GetBloodFurnaceAI<npc_shadowmoon_channelerAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
@@ -120,7 +120,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_the_makerAI(creature);
+        return GetBloodFurnaceAI<boss_the_makerAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
@@ -165,7 +165,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_omor_the_unscarredAI>(creature);
+        return GetHellfireRampartsAI<boss_omor_the_unscarredAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
@@ -128,7 +128,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_vazruden_the_heraldAI(creature);
+        return GetHellfireRampartsAI<boss_vazruden_the_heraldAI>(creature);
    }
 };

@@ -236,7 +236,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_nazanAI(creature);
+        return GetHellfireRampartsAI<boss_nazanAI>(creature);
    }
 };

@@ -307,7 +307,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_vazrudenAI(creature);
+        return GetHellfireRampartsAI<boss_vazrudenAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
@@ -143,7 +143,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_watchkeeper_gargolmarAI(creature);
+        return GetHellfireRampartsAI<boss_watchkeeper_gargolmarAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
@@ -6,6 +6,9 @@
 #define DEF_RAMPARTS_H

 #include "SpellScript.h"
+#include "CreatureAIImpl.h"
+
+#define HellfireRampartsScriptName "instance_hellfire_ramparts"

 enum DataTypes
 {
@@ -29,4 +32,10 @@ enum GameobjectIds
    GO_FEL_IRON_CHECT_HEROIC    = 185169
 };

+template <class AI, class T>
+inline AI* GetHellfireRampartsAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, HellfireRampartsScriptName);
+}
+
 #endif
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
@@ -246,7 +246,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_magtheridonAI>(creature);
+        return GetMagtheridonsLairAI<boss_magtheridonAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
@@ -6,6 +6,9 @@
 #define DEF_MAGTHERIDONS_LAIR_H

 #include "SpellScript.h"
+#include "CreatureAIImpl.h"
+
+#define MagtheridonsLairScriptName "instance_magtheridons_lair"

 enum DataTypes
 {
@@ -38,4 +41,10 @@ enum GoIds
    GO_MAGTHERIDON_COLUMN5          = 184639
 };

+template <class AI, class T>
+inline AI* GetMagtheridonsLairAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, MagtheridonsLairScriptName);
+}
+
 #endif
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
@@ -240,7 +240,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_grand_warlock_nethekurseAI>(creature);
+        return GetShatteredHallsAI<boss_grand_warlock_nethekurseAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
@@ -211,7 +211,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_warbringer_omroggAI>(creature);
+        return GetShatteredHallsAI<boss_warbringer_omroggAI>(creature);
    }
 };

@@ -248,7 +248,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<npc_omrogg_headsAI>(creature);
+        return GetShatteredHallsAI<npc_omrogg_headsAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
@@ -167,7 +167,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_warchief_kargath_bladefistAI>(creature);
+        return GetShatteredHallsAI<boss_warchief_kargath_bladefistAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
@@ -5,9 +5,12 @@
 #ifndef DEF_SHATTERED_H
 #define DEF_SHATTERED_H

+#include "CreatureAIImpl.h"
 #include "PassiveAI.h"
 #include "SpellScript.h"

+#define ShatteredHallsLairScriptName "instance_shattered_halls"
+
 enum DataTypes
 {
    DATA_NETHEKURSE                 = 0,
@@ -51,4 +54,10 @@ enum SpellIds
    SPELL_KARGATHS_EXECUTIONER_3    = 39290
 };

+template <class AI, class T>
+inline AI* GetShatteredHallsAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, ShatteredHallsLairScriptName);
+}
+
 #endif
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -327,7 +327,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_alarAI>(creature);
+        return GetTheEyeAI<boss_alarAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
@@ -225,7 +225,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_high_astromancer_solarianAI>(creature);
+        return GetTheEyeAI<boss_high_astromancer_solarianAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -706,7 +706,7 @@ public:
    };
    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_kaelthasAI>(creature);
+        return GetTheEyeAI<boss_kaelthasAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
@@ -113,7 +113,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return GetInstanceAI<boss_void_reaverAI>(creature);
+        return GetTheEyeAI<boss_void_reaverAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
+++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
@@ -5,11 +5,14 @@
 #ifndef DEF_THE_EYE_H
 #define DEF_THE_EYE_H

+#include "CreatureAIImpl.h"
 #include "GridNotifiers.h"
 #include "Player.h"
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"

+#define TheEyeScriptName "instance_the_eye"
+
 enum EyeData
 {
    DATA_ALAR               = 0,
@@ -41,4 +44,10 @@ enum EyeGOs
    GO_KAEL_STATUE_LEFT     = 184597
 };

+template <class AI, class T>
+inline AI* GetTheEyeAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, TheEyeScriptName);
+}
+
 #endif
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
@@ -91,7 +91,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_gatewatcher_gyrokillAI(creature);
+        return GetMechanarAI<boss_gatewatcher_gyrokillAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
@@ -94,7 +94,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_gatewatcher_iron_handAI(creature);
+        return GetMechanarAI<boss_gatewatcher_iron_handAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
@@ -126,7 +126,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_mechano_lord_capacitusAI(creature);
+        return GetMechanarAI<boss_mechano_lord_capacitusAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
@@ -115,7 +115,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_nethermancer_sepethreaAI(creature);
+        return GetMechanarAI<boss_nethermancer_sepethreaAI>(creature);
    }
 };

@@ -179,7 +179,7 @@ public:
    };
    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new npc_ragin_flamesAI(creature);
+        return GetMechanarAI<npc_ragin_flamesAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
@@ -146,7 +146,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_pathaleon_the_calculatorAI(creature);
+        return GetMechanarAI<boss_pathaleon_the_calculatorAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h
@@ -6,10 +6,13 @@
 #define DEF_MECHANAR_H

 #include "CreatureAI.h"
+#include "CreatureAIImpl.h"
 #include "Player.h"
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"

+#define MechanarScriptName "instance_mechanar"
+
 enum DataTypes
 {
    DATA_GATEWATCHER_GYROKILL           = 0,
@@ -52,4 +55,10 @@ enum SpellIds
    SPELL_TELEPORT_VISUAL               = 35517
 };

+template <class AI, class T>
+inline AI* GetMechanarAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, MechanarScriptName);
+}
+
 #endif
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
@@ -231,7 +231,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new npc_millhouse_manastormAI(creature);
+        return GetArcatrazAI<npc_millhouse_manastormAI>(creature);
    }
 };

@@ -560,7 +560,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new npc_warden_mellicharAI(creature);
+        return GetArcatrazAI<npc_warden_mellicharAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
@@ -6,9 +6,12 @@
 #define ARCATRAZ_H

 #include "CreatureAI.h"
+#include "CreatureAIImpl.h"
 #include "Player.h"
 #include "SpellScript.h"

+#define ArcatrazScriptName "instance_arcatraz"
+
 enum DataTypes
 {
    // Encounter States/Boss GUIDs
@@ -54,4 +57,10 @@ enum SpellIds
    SPELL_SOUL_STEAL                        = 36782
 };

+template <class AI, class T>
+inline AI* GetArcatrazAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, ArcatrazScriptName);
+}
+
 #endif // ARCATRAZ_H
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
@@ -161,7 +161,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_dalliah_the_doomsayerAI(creature);
+        return GetArcatrazAI<boss_dalliah_the_doomsayerAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
@@ -163,7 +163,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_harbinger_skyrissAI(creature);
+        return GetArcatrazAI<boss_harbinger_skyrissAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
@@ -242,7 +242,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_wrath_scryer_soccothratesAI(creature);
+        return GetArcatrazAI<boss_wrath_scryer_soccothratesAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
@@ -93,7 +93,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_zereketh_the_unboundAI(creature);
+        return GetArcatrazAI<boss_zereketh_the_unboundAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
@@ -108,7 +108,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_commander_sarannisAI(creature);
+        return GetTheBotanicaAI<boss_commander_sarannisAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
@@ -137,7 +137,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_high_botanist_freywinnAI(creature);
+        return GetTheBotanicaAI<boss_high_botanist_freywinnAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
@@ -133,7 +133,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_lajAI(creature);
+        return GetTheBotanicaAI<boss_lajAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
@@ -143,7 +143,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_thorngrin_the_tenderAI(creature);
+        return GetTheBotanicaAI<boss_thorngrin_the_tenderAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
@@ -100,7 +100,7 @@ public:

    CreatureAI* GetAI(Creature* creature) const override
    {
-        return new boss_warp_splinterAI(creature);
+        return GetTheBotanicaAI<boss_warp_splinterAI>(creature);
    }
 };

--- a/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h
+++ b/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h
@@ -6,6 +6,9 @@
 #define DEF_THE_BOTANICA_H

 #include "SpellScript.h"
+#include "CreatureAIImpl.h"
+
+#define TheBotanicaScriptName "instance_the_botanica"

 enum DataTypes
 {
@@ -36,4 +39,10 @@ enum SpellIds
    SPELL_SHADOW_FORM                   = 34205
 };

+template <class AI, class T>
+inline AI* GetTheBotanicaAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, TheBotanicaScriptName);
+}
+
 #endif