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

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp

@@ -134,7 +134,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_grimstoneAI>(creature);
+        return GetBlackrockDepthsAI<npc_grimstoneAI>(creature);
     }
 
     struct npc_grimstoneAI : public npc_escortAI
@@ -331,7 +331,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_phalanxAI(creature);
+        return GetBlackrockDepthsAI<npc_phalanxAI>(creature);
     }
 
     struct npc_phalanxAI : public ScriptedAI
@@ -500,7 +500,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_rocknotAI>(creature);
+        return GetBlackrockDepthsAI<npc_rocknotAI>(creature);
     }
 
     struct npc_rocknotAI : public npc_escortAI

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h

@@ -7,6 +7,9 @@
 #ifndef DEF_BRD_H
 #define DEF_BRD_H
 
+#include "CreatureAIImpl.h"
+#define BRDScriptName "instance_blackrock_depths"
+
 enum FactionIds
 {
     FACTION_NEUTRAL            = 734,
@@ -56,4 +59,10 @@ enum DataTypes
     DATA_OPEN_COFFER_DOORS  = 30
 };
 
+template <class AI, class T>
+inline AI* GetBlackrockDepthsAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, BRDScriptName);
+}
+
 #endif

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp

@@ -47,7 +47,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_ambassador_flamelashAI>(creature);
+        return GetBlackrockDepthsAI<boss_ambassador_flamelashAI>(creature);
     }
 
     struct boss_ambassador_flamelashAI : public BossAI
@@ -208,7 +208,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_burning_spiritAI>(creature);
+        return GetBlackrockDepthsAI<npc_burning_spiritAI>(creature);
     }
 
     struct npc_burning_spiritAI : public CreatureAI

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp

@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  */
 
+#include "blackrock_depths.h"
 #include "ScriptedCreature.h"
 #include "ScriptMgr.h"
 
@@ -23,7 +24,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_anubshiahAI(creature);
+        return GetBlackrockDepthsAI<boss_anubshiahAI>(creature);
     }
 
     struct boss_anubshiahAI : public ScriptedAI

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp

@@ -27,7 +27,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_draganthaurissanAI>(creature);
+        return GetBlackrockDepthsAI<boss_draganthaurissanAI>(creature);
     }
 
     struct boss_draganthaurissanAI : public ScriptedAI

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp

@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  */
 
+#include "blackrock_depths.h"
 #include "ScriptedCreature.h"
 #include "ScriptMgr.h"
 
@@ -21,7 +22,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_general_angerforgeAI(creature);
+        return GetBlackrockDepthsAI<boss_general_angerforgeAI>(creature);
     }
 
     struct boss_general_angerforgeAI : public ScriptedAI

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp

@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  */
 
+#include "blackrock_depths.h"
 #include "ScriptedCreature.h"
 #include "ScriptMgr.h"
 
@@ -20,7 +21,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_gorosh_the_dervishAI(creature);
+        return GetBlackrockDepthsAI<boss_gorosh_the_dervishAI>(creature);
     }
 
     struct boss_gorosh_the_dervishAI : public ScriptedAI

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp

@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  */
 
+#include "blackrock_depths.h"
 #include "ScriptedCreature.h"
 #include "ScriptMgr.h"
 
@@ -21,7 +22,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_grizzleAI(creature);
+        return GetBlackrockDepthsAI<boss_grizzleAI>(creature);
     }
 
     struct boss_grizzleAI : public ScriptedAI

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp

@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  */
 
+#include "blackrock_depths.h"
 #include "ScriptedCreature.h"
 #include "ScriptMgr.h"
 
@@ -22,7 +23,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_high_interrogator_gerstahnAI(creature);
+        return GetBlackrockDepthsAI<boss_high_interrogator_gerstahnAI>(creature);
     }
 
     struct boss_high_interrogator_gerstahnAI : public ScriptedAI

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp

@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  */
 
+#include "blackrock_depths.h"
 #include "ScriptedCreature.h"
 #include "ScriptMgr.h"
 
@@ -13,11 +14,6 @@ enum Spells
     SPELL_WARSTOMP                                         = 24375
 };
 
-enum Misc
-{
-    DATA_THRONE_DOOR                                       = 24 // not id or guid of doors but number of enum in blackrock_depths.h
-};
-
 class boss_magmus : public CreatureScript
 {
 public:
@@ -25,7 +21,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_magmusAI(creature);
+        return GetBlackrockDepthsAI<boss_magmusAI>(creature);
     }
 
     struct boss_magmusAI : public ScriptedAI

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp

@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  */
 
+#include "blackrock_depths.h"
 #include "ScriptedCreature.h"
 #include "ScriptMgr.h"
 
@@ -24,7 +25,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_moira_bronzebeardAI(creature);
+        return GetBlackrockDepthsAI<boss_moira_bronzebeardAI>(creature);
     }
 
     struct boss_moira_bronzebeardAI : public ScriptedAI

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp

@@ -126,7 +126,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_doomrelAI>(creature);
+        return GetBlackrockDepthsAI<boss_doomrelAI>(creature);
     }
 
     struct boss_doomrelAI : public ScriptedAI

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h

@@ -9,6 +9,8 @@
 #ifndef DEF_BLACKROCK_SPIRE_H
 #define DEF_BLACKROCK_SPIRE_H
 
+#include "CreatureAIImpl.h"
+
 uint32 const EncounterCount         = 23;
 
 #define BRSScriptName "instance_blackrock_spire"
@@ -115,4 +117,10 @@ enum npcspells
     SPELL_FINKLE_IS_EINHORN         = 16710
 };
 
+template <class AI, class T>
+inline AI* GetBlackrockSpireAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, BRSScriptName);
+}
+
 #endif

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp

@@ -120,7 +120,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_drakkisathAI(creature);
+        return GetBlackrockSpireAI<boss_drakkisathAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp

@@ -91,7 +91,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_gizrul_the_slavenerAI(creature);
+        return GetBlackrockSpireAI<boss_gizrul_the_slavenerAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp

@@ -157,7 +157,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_gythAI>(creature);
+        return GetBlackrockSpireAI<boss_gythAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp

@@ -90,7 +90,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_halyconAI(creature);
+        return GetBlackrockSpireAI<boss_halyconAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp

@@ -27,7 +27,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_highlordomokkAI(creature);
+        return GetBlackrockSpireAI<boss_highlordomokkAI>(creature);
     }
 
     struct boss_highlordomokkAI : public BossAI

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp

@@ -116,7 +116,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_lord_valthalakAI>(creature);
+        return GetBlackrockSpireAI<boss_lord_valthalakAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp

@@ -40,7 +40,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_overlordwyrmthalakAI(creature);
+        return GetBlackrockSpireAI<boss_overlordwyrmthalakAI>(creature);
     }
 
     struct boss_overlordwyrmthalakAI : public BossAI

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp

@@ -295,7 +295,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_pyroguard_emberseerAI>(creature);
+        return GetBlackrockSpireAI<boss_pyroguard_emberseerAI>(creature);
     }
 };
 
@@ -416,7 +416,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_blackhand_incarceratorAI(creature);
+        return GetBlackrockSpireAI<npc_blackhand_incarceratorAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp

@@ -78,7 +78,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_quatermasterzigrisAI(creature);
+        return GetBlackrockSpireAI<boss_quatermasterzigrisAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp

@@ -471,7 +471,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_rend_blackhandAI>(creature);
+        return GetBlackrockSpireAI<boss_rend_blackhandAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp

@@ -29,7 +29,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_shadowvoshAI(creature);
+        return GetBlackrockSpireAI<boss_shadowvoshAI>(creature);
     }
 
     struct boss_shadowvoshAI : public BossAI

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp

@@ -29,7 +29,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_thebeastAI(creature);
+        return GetBlackrockSpireAI<boss_thebeastAI>(creature);
     }
 
     struct boss_thebeastAI : public BossAI

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp

@@ -94,7 +94,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_urok_doomhowlAI(creature);
+        return GetBlackrockSpireAI<boss_urok_doomhowlAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp

@@ -104,7 +104,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_warmastervooneAI(creature);
+        return GetBlackrockSpireAI<boss_warmastervooneAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h

@@ -80,4 +80,10 @@ enum BWLMisc
     SAY_NEFARIAN_VAEL_INTRO     = 100003, // latest id in broadcast_text atm
 };
 
+template <class AI, class T>
+inline AI* GetBlackwingLairAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, BWLScriptName);
+}
+
 #endif

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp

@@ -120,7 +120,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_broodlordAI>(creature);
+        return GetBlackwingLairAI<boss_broodlordAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp

@@ -281,7 +281,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_chromaggusAI>(creature);
+        return GetBlackwingLairAI<boss_chromaggusAI>(creature);
     }
 };
 
@@ -319,7 +319,7 @@ class go_chromaggus_lever : public GameObjectScript
 
         GameObjectAI* GetAI(GameObject* go) const override
         {
-            return GetInstanceAI<go_chromaggus_leverAI>(go);
+            return GetBlackwingLairAI<go_chromaggus_leverAI>(go);
         }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp

@@ -78,7 +78,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_ebonrocAI>(creature);
+        return GetBlackwingLairAI<boss_ebonrocAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp

@@ -80,7 +80,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_firemawAI>(creature);
+        return GetBlackwingLairAI<boss_firemawAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp

@@ -86,7 +86,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_flamegorAI>(creature);
+        return GetBlackwingLairAI<boss_flamegorAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp

@@ -387,7 +387,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_victor_nefariusAI>(creature);
+        return GetBlackwingLairAI<boss_victor_nefariusAI>(creature);
     }
 };
 
@@ -595,7 +595,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_nefarianAI>(creature);
+        return GetBlackwingLairAI<boss_nefarianAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp

@@ -145,7 +145,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_razorgoreAI>(creature);
+        return GetBlackwingLairAI<boss_razorgoreAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp

@@ -267,7 +267,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_vaelAI>(creature);
+        return GetBlackwingLairAI<boss_vaelAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp

@@ -103,7 +103,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_baron_geddonAI(creature);
+        return GetMoltenCoreAI<boss_baron_geddonAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp

@@ -85,7 +85,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_garrAI(creature);
+        return GetMoltenCoreAI<boss_garrAI>(creature);
     }
 };
 
@@ -137,7 +137,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_fireswornAI(creature);
+        return GetMoltenCoreAI<npc_fireswornAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp

@@ -88,7 +88,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_gehennasAI(creature);
+        return GetMoltenCoreAI<boss_gehennasAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp

@@ -117,7 +117,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_golemaggAI(creature);
+        return GetMoltenCoreAI<boss_golemaggAI>(creature);
     }
 };
 
@@ -178,7 +178,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_core_ragerAI>(creature);
+        return GetMoltenCoreAI<npc_core_ragerAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp

@@ -86,7 +86,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_lucifronAI(creature);
+        return GetMoltenCoreAI<boss_lucifronAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp

@@ -105,7 +105,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_magmadarAI(creature);
+        return GetMoltenCoreAI<boss_magmadarAI>(creature);
     }
 };
 
@@ -239,7 +239,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_magmadar_core_houndAI(creature);
+        return GetMoltenCoreAI<npc_magmadar_core_houndAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp

@@ -195,7 +195,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_majordomoAI>(creature);
+        return GetMoltenCoreAI<boss_majordomoAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp

@@ -291,7 +291,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_ragnarosAI>(creature);
+        return GetMoltenCoreAI<boss_ragnarosAI>(creature);
     }
 };
 
@@ -323,7 +323,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_son_of_flameAI>(creature);
+        return GetMoltenCoreAI<npc_son_of_flameAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp

@@ -101,7 +101,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_shazzrahAI(creature);
+        return GetMoltenCoreAI<boss_shazzrahAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp

@@ -117,7 +117,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_sulfuronAI(creature);
+        return GetMoltenCoreAI<boss_sulfuronAI>(creature);
     }
 };
 
@@ -193,7 +193,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_flamewaker_priestAI(creature);
+        return GetMoltenCoreAI<npc_flamewaker_priestAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h

@@ -9,6 +9,10 @@
 #ifndef DEF_MOLTEN_CORE_H
 #define DEF_MOLTEN_CORE_H
 
+#include "CreatureAIImpl.h"
+
+#define MCScriptName "instance_molten_core"
+
 enum Encounters
 {
     BOSS_LUCIFRON                   = 0,
@@ -68,4 +72,10 @@ enum Data
     DATA_RAGNAROS_ADDS  = 0,
 };
 
+template <class AI, class T>
+inline AI* GetMoltenCoreAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, MCScriptName);
+}
+
 #endif

src/server/scripts/EasternKingdoms/CMakeLists.txt

@@ -90,6 +90,7 @@ set(scripts_STAT_SRCS
   ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_wetlands.cpp
   ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_arathi_highlands.cpp
   ${AC_SCRIPTS_DIR}/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Gnomeregan/gnomeregan.h
   ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_redridge_mountains.cpp
   ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_ironforge.cpp
   ${AC_SCRIPTS_DIR}/EasternKingdoms/ScarletEnclave/chapter2.cpp
@@ -125,6 +126,7 @@ set(scripts_STAT_SRCS
   ${AC_SCRIPTS_DIR}/EasternKingdoms/Deadmines/deadmines.h
   ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_duskwood.cpp
   ${AC_SCRIPTS_DIR}/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ScarletMonastery/scarletmonastery.h
   ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_undercity.cpp
   ${AC_SCRIPTS_DIR}/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
   ${AC_SCRIPTS_DIR}/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h

src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.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 "deadmines.h"
 #include "ScriptedCreature.h"
 #include "ScriptMgr.h"
 
@@ -33,7 +34,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_mr_smiteAI>(creature);
+        return GetDeadminesAI<boss_mr_smiteAI>(creature);
     }
 
     struct boss_mr_smiteAI : public ScriptedAI

src/server/scripts/EasternKingdoms/Deadmines/deadmines.h

@@ -5,6 +5,10 @@
 #ifndef DEF_DEADMINES_H
 #define DEF_DEADMINES_H
 
+#include "CreatureAIImpl.h"
+
+#define DeadminesScriptName "instance_deadmines"
+
 enum DataTypes
 {
     TYPE_RHAHK_ZOR              = 0,
@@ -18,4 +22,10 @@ enum GameObjects
     GO_IRON_CLAD_DOOR           = 16397
 };
 
+template <class AI, class T>
+inline AI* GetDeadminesAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, DeadminesScriptName);
+}
+
 #endif

src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h

@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
+ */
+
+#ifndef DEF_GNOMEREGAN_H
+#define DEF_GNOMEREGAN_H
+
+#include "CreatureAIImpl.h"
+
+#define GnomereganScriptName "instance_gnomeregan"
+
+template <class AI, class T>
+inline AI* GetGnomereganAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, GnomereganScriptName);
+}
+
+#endif

src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.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 "gnomeregan.h"
 #include "InstanceScript.h"
 #include "PassiveAI.h"
 #include "Player.h"
@@ -38,7 +39,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_kernobeeAI(creature);
+        return GetGnomereganAI<npc_kernobeeAI>(creature);
     }
 
     bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override

src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp

@@ -152,7 +152,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_curatorAI>(creature);
+        return GetKarazhanAI<boss_curatorAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp

@@ -104,7 +104,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_maiden_of_virtueAI>(creature);
+        return GetKarazhanAI<boss_maiden_of_virtueAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp

@@ -186,7 +186,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_midnightAI>(creature);
+        return GetKarazhanAI<boss_midnightAI>(creature);
     }
 };
 
@@ -299,7 +299,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_attumenAI>(creature);
+        return GetKarazhanAI<boss_attumenAI>(creature);
     }
 };
 
@@ -404,7 +404,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_attumen_midnightAI>(creature);
+        return GetKarazhanAI<boss_attumen_midnightAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp

@@ -241,7 +241,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_moroesAI>(creature);
+        return GetKarazhanAI<boss_moroesAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp

@@ -59,7 +59,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_netherspiteAI>(creature);
+        return GetKarazhanAI<boss_netherspiteAI>(creature);
     }
 
     struct boss_netherspiteAI : public ScriptedAI

src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp

@@ -60,7 +60,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_nightbaneAI (creature);
+        return GetKarazhanAI<boss_nightbaneAI>(creature);
     }
 
     struct boss_nightbaneAI : public ScriptedAI

src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp

@@ -155,7 +155,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_malchezaarAI>(creature);
+        return GetKarazhanAI<boss_malchezaarAI>(creature);
     }
 
     struct boss_malchezaarAI : public ScriptedAI
@@ -448,7 +448,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<prince_axesAI>(creature);
+        return GetKarazhanAI<prince_axesAI>(creature);
     }
 
     struct prince_axesAI : public ScriptedAI

src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp

@@ -155,7 +155,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_servant_quartersAI>(creature);
+        return GetKarazhanAI<boss_servant_quartersAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp

@@ -546,7 +546,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_aranAI>(creature);
+        return GetKarazhanAI<boss_aranAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp

@@ -58,7 +58,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_kilrekAI>(creature);
+        return GetKarazhanAI<npc_kilrekAI>(creature);
     }
 
     struct npc_kilrekAI : public ScriptedAI
@@ -123,7 +123,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_demon_chainAI(creature);
+        return GetKarazhanAI<npc_demon_chainAI>(creature);
     }
 
     struct npc_demon_chainAI : public ScriptedAI
@@ -160,7 +160,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_fiendish_portalAI(creature);
+        return GetKarazhanAI<npc_fiendish_portalAI>(creature);
     }
 
     struct npc_fiendish_portalAI : public PassiveAI
@@ -194,7 +194,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_fiendish_impAI(creature);
+        return GetKarazhanAI<npc_fiendish_impAI>(creature);
     }
 
     struct npc_fiendish_impAI : public ScriptedAI
@@ -236,7 +236,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_terestianAI>(creature);
+        return GetKarazhanAI<boss_terestianAI>(creature);
     }
 
     struct boss_terestianAI : public ScriptedAI

src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp

@@ -108,7 +108,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_dorotheeAI>(creature);
+        return GetKarazhanAI<boss_dorotheeAI>(creature);
     }
 
     struct boss_dorotheeAI : public ScriptedAI
@@ -235,7 +235,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_titoAI(creature);
+        return GetKarazhanAI<npc_titoAI>(creature);
     }
 
     struct npc_titoAI : public ScriptedAI
@@ -306,7 +306,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_strawmanAI>(creature);
+        return GetKarazhanAI<boss_strawmanAI>(creature);
     }
 
     struct boss_strawmanAI : public ScriptedAI
@@ -427,7 +427,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_tinheadAI>(creature);
+        return GetKarazhanAI<boss_tinheadAI>(creature);
     }
 
     struct boss_tinheadAI : public ScriptedAI
@@ -543,7 +543,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_roarAI>(creature);
+        return GetKarazhanAI<boss_roarAI>(creature);
     }
 
     struct boss_roarAI : public ScriptedAI
@@ -660,7 +660,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_croneAI>(creature);
+        return GetKarazhanAI<boss_croneAI>(creature);
     }
 
     struct boss_croneAI : public ScriptedAI
@@ -739,7 +739,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_cycloneAI(creature);
+        return GetKarazhanAI<npc_cycloneAI>(creature);
     }
 
     struct npc_cycloneAI : public ScriptedAI
@@ -832,7 +832,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_bigbadwolfAI>(creature);
+        return GetKarazhanAI<boss_bigbadwolfAI>(creature);
     }
 
     struct boss_bigbadwolfAI : public ScriptedAI
@@ -1032,7 +1032,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_julianneAI>(creature);
+        return GetKarazhanAI<boss_julianneAI>(creature);
     }
 
     struct boss_julianneAI : public ScriptedAI
@@ -1151,7 +1151,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_romuloAI>(creature);
+        return GetKarazhanAI<boss_romuloAI>(creature);
     }
 
     struct boss_romuloAI : public ScriptedAI

src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp

@@ -395,7 +395,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_barnesAI(creature);
+        return GetKarazhanAI<npc_barnesAI>(creature);
     }
 };
 
@@ -423,7 +423,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_image_of_medivhAI(creature);
+        return GetKarazhanAI<npc_image_of_medivhAI>(creature);
     }
 
     struct npc_image_of_medivhAI : public ScriptedAI

src/server/scripts/EasternKingdoms/Karazhan/karazhan.h

@@ -21,6 +21,9 @@
 #ifndef DEF_KARAZHAN_H
 #define DEF_KARAZHAN_H
 
+#include "CreatureAIImpl.h"
+
+#define KarazhanScriptName "instance_karazhan"
 #define DataHeader "KZ"
 
 uint32 const EncounterCount = 12;
@@ -121,4 +124,10 @@ enum KarazhanSpells
     SPELL_BLINK = 29884
 };
 
+template <class AI, class T>
+inline AI* GetKarazhanAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, KarazhanScriptName);
+}
+
 #endif

src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp

@@ -71,7 +71,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_felblood_kaelthasAI(creature);
+        return GetMagistersTerraceAI<boss_felblood_kaelthasAI>(creature);
     }
 
     struct boss_felblood_kaelthasAI : public ScriptedAI

src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp

@@ -71,7 +71,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_priestess_delrissaAI(creature);
+        return GetMagistersTerraceAI<boss_priestess_delrissaAI>(creature);
     }
 
     struct boss_priestess_delrissaAI : public ScriptedAI
@@ -414,7 +414,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_kagani_nightstrikeAI(creature);
+        return GetMagistersTerraceAI<boss_kagani_nightstrikeAI>(creature);
     }
 
     struct boss_kagani_nightstrikeAI : public boss_priestess_lackey_commonAI
@@ -514,7 +514,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_ellris_duskhallowAI(creature);
+        return GetMagistersTerraceAI<boss_ellris_duskhallowAI>(creature);
     }
 
     struct boss_ellris_duskhallowAI : public boss_priestess_lackey_commonAI
@@ -592,7 +592,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_eramas_brightblazeAI(creature);
+        return GetMagistersTerraceAI<boss_eramas_brightblazeAI>(creature);
     }
 
     struct boss_eramas_brightblazeAI : public boss_priestess_lackey_commonAI
@@ -666,7 +666,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_yazzaiAI(creature);
+        return GetMagistersTerraceAI<boss_yazzaiAI>(creature);
     }
 
     struct boss_yazzaiAI : public boss_priestess_lackey_commonAI
@@ -774,7 +774,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_warlord_salarisAI(creature);
+        return GetMagistersTerraceAI<boss_warlord_salarisAI>(creature);
     }
 
     struct boss_warlord_salarisAI : public boss_priestess_lackey_commonAI
@@ -860,7 +860,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_garaxxasAI(creature);
+        return GetMagistersTerraceAI<boss_garaxxasAI>(creature);
     }
 
     struct boss_garaxxasAI : public boss_priestess_lackey_commonAI
@@ -949,7 +949,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_apokoAI(creature);
+        return GetMagistersTerraceAI<boss_apokoAI>(creature);
     }
 
     struct boss_apokoAI : public boss_priestess_lackey_commonAI
@@ -1047,7 +1047,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_zelfanAI(creature);
+        return GetMagistersTerraceAI<boss_zelfanAI>(creature);
     }
 
     struct boss_zelfanAI : public boss_priestess_lackey_commonAI

src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp

@@ -46,7 +46,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_selin_fireheartAI>(creature);
+        return GetMagistersTerraceAI<boss_selin_fireheartAI>(creature);
     };
 
     struct boss_selin_fireheartAI : public ScriptedAI

src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp

@@ -52,7 +52,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_vexallusAI(creature);
+        return GetMagistersTerraceAI<boss_vexallusAI>(creature);
     };
 
     struct boss_vexallusAI : public ScriptedAI

src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h

@@ -8,6 +8,9 @@
 #include "CreatureAI.h"
 #include "Player.h"
 #include "SpellScript.h"
+#include "CreatureAIImpl.h"
+
+#define MTScriptName "instance_magisters_terrace"
 
 enum MTData
 {
@@ -37,4 +40,10 @@ enum MTGameObjects
     GO_ESCAPE_ORB               = 188173
 };
 
+template <class AI, class T>
+inline AI* GetMagistersTerraceAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, MTScriptName);
+}
+
 #endif

src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp

@@ -4,6 +4,7 @@
 REWRITTEN BY XINEF
 */
 
+#include "scarletmonastery.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "ScriptMgr.h"
@@ -227,7 +228,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_scarlet_guardAI(creature);
+        return GetScarletMonasteryAI<npc_scarlet_guardAI>(creature);
     }
 };
 
@@ -504,7 +505,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_mograineAI(creature);
+        return GetScarletMonasteryAI<npc_mograineAI>(creature);
     }
 };
 
@@ -646,7 +647,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_high_inquisitor_whitemaneAI(creature);
+        return GetScarletMonasteryAI<boss_high_inquisitor_whitemaneAI>(creature);
     }
 };
 
@@ -787,7 +788,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_fairbanksAI(creature);
+        return GetScarletMonasteryAI<npc_fairbanksAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/ScarletMonastery/scarletmonastery.h

@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
+ */
+
+#ifndef DEF_SCARLETMONANSTERY_H
+#define DEF_SCARLETMONANSTERY_H
+
+#include "CreatureAIImpl.h"
+
+#define ScarletMonasteryScriptName "instance_scarlet_monastery"
+
+template <class AI, class T>
+inline AI* GetScarletMonasteryAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, ScarletMonasteryScriptName);
+}
+
+#endif

src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp

@@ -212,7 +212,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_kirtonos_the_heraldAI>(creature);
+        return GetScholomanceAI<boss_kirtonos_the_heraldAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp

@@ -13,7 +13,7 @@
 class instance_scholomance : public InstanceMapScript
 {
 public:
-    instance_scholomance() : InstanceMapScript("instance_scholomance", 289) { }
+    instance_scholomance() : InstanceMapScript(ScholomanceScriptName, 289) { }
 
     InstanceScript* GetInstanceScript(InstanceMap* map) const override
     {

src/server/scripts/EasternKingdoms/Scholomance/scholomance.h

@@ -5,6 +5,10 @@
 #ifndef DEF_SCHOLOMANCE_H
 #define DEF_SCHOLOMANCE_H
 
+#include "CreatureAIImpl.h"
+
+#define ScholomanceScriptName "instance_scholomance"
+
 enum DataTypes
 {
     DATA_KIRTONOS_THE_HERALD            = 0,
@@ -58,4 +62,10 @@ enum SpellIds
     SPELL_SHADOW_PORTAL_VAULTOFTHERAVENIAN      = 17948
 };
 
+template <class AI, class T>
+inline AI* GetScholomanceAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, ScholomanceScriptName);
+}
+
 #endif

src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp

@@ -142,7 +142,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_brutallusAI>(creature);
+        return GetSunwellPlateauAI<boss_brutallusAI>(creature);
     }
 };
 
@@ -386,7 +386,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_madrigosaAI>(creature);
+        return GetSunwellPlateauAI<npc_madrigosaAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp

@@ -209,7 +209,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_sacrolashAI>(creature);
+        return GetSunwellPlateauAI<boss_sacrolashAI>(creature);
     };
 };
 
@@ -347,7 +347,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_alythessAI>(creature);
+        return GetSunwellPlateauAI<boss_alythessAI>(creature);
     };
 };
 

src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp

@@ -373,7 +373,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_felmystAI>(creature);
+        return GetSunwellPlateauAI<boss_felmystAI>(creature);
     }
 };
 
@@ -384,7 +384,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_demonic_vaporAI(creature);
+        return GetSunwellPlateauAI<npc_demonic_vaporAI>(creature);
     }
 
     struct npc_demonic_vaporAI : public NullCreatureAI
@@ -420,7 +420,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_demonic_vapor_trailAI(creature);
+        return GetSunwellPlateauAI<npc_demonic_vapor_trailAI>(creature);
     }
 
     struct npc_demonic_vapor_trailAI : public NullCreatureAI

src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp

@@ -341,7 +341,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_kalecgosAI>(creature);
+        return GetSunwellPlateauAI<boss_kalecgosAI>(creature);
     }
 };
 
@@ -362,7 +362,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_kalecAI>(creature);
+        return GetSunwellPlateauAI<boss_kalecAI>(creature);
     }
 
     struct boss_kalecAI : public ScriptedAI
@@ -479,7 +479,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_sathrovarrAI>(creature);
+        return GetSunwellPlateauAI<boss_sathrovarrAI>(creature);
     }
 
     struct boss_sathrovarrAI : public ScriptedAI

src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp

@@ -153,7 +153,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_kiljaeden_controllerAI>(creature);
+        return GetSunwellPlateauAI<npc_kiljaeden_controllerAI>(creature);
     }
 
     struct npc_kiljaeden_controllerAI : public NullCreatureAI
@@ -650,7 +650,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_kiljaedenAI>(creature);
+        return GetSunwellPlateauAI<boss_kiljaedenAI>(creature);
     }
 };
 
@@ -762,7 +762,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_kalecgos_kjAI>(creature);
+        return GetSunwellPlateauAI<npc_kalecgos_kjAI>(creature);
     }
 
     struct npc_kalecgos_kjAI : public NullCreatureAI

src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp

@@ -138,7 +138,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_muruAI>(creature);
+        return GetSunwellPlateauAI<boss_muruAI>(creature);
     }
 };
 
@@ -248,7 +248,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_entropiusAI>(creature);
+        return GetSunwellPlateauAI<boss_entropiusAI>(creature);
     }
 };
 
@@ -259,7 +259,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_singularityAI>(creature);
+        return GetSunwellPlateauAI<npc_singularityAI>(creature);
     }
 
     struct npc_singularityAI : public NullCreatureAI

src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h

@@ -11,6 +11,8 @@
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
 
+#define SWPScriptName "instance_sunwell_plateau"
+
 enum DataTypes
 {
     DATA_KALECGOS                           = 0,
@@ -86,4 +88,10 @@ enum SpellIds
     SPELL_SUNWELL_RADIANCE                  = 45769,
 };
 
+template <class AI, class T>
+inline AI* GetSunwellPlateauAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, SWPScriptName);
+}
+
 #endif // SUNWELL_PLATEAU_H

src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp

@@ -363,7 +363,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_akilzonAI>(creature);
+        return GetZulAmanAI<boss_akilzonAI>(creature);
     }
 };
 
@@ -444,7 +444,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_akilzon_eagleAI(creature);
+        return GetZulAmanAI<npc_akilzon_eagleAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp

@@ -305,7 +305,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_halazziAI>(creature);
+        return GetZulAmanAI<boss_halazziAI>(creature);
     }
 };
 
@@ -367,7 +367,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_halazzi_lynxAI(creature);
+        return GetZulAmanAI<npc_halazzi_lynxAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp

@@ -498,7 +498,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_hex_lord_malacrassAI>(creature);
+        return GetZulAmanAI<boss_hex_lord_malacrassAI>(creature);
     }
 };
 
@@ -555,7 +555,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_thurgAI>(creature);
+        return GetZulAmanAI<boss_thurgAI>(creature);
     }
 };
 
@@ -652,7 +652,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_alyson_antilleAI>(creature);
+        return GetZulAmanAI<boss_alyson_antilleAI>(creature);
     }
 };
 
@@ -746,7 +746,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_lord_raadanAI>(creature);
+        return GetZulAmanAI<boss_lord_raadanAI>(creature);
     }
 };
 
@@ -787,7 +787,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_darkheartAI>(creature);
+        return GetZulAmanAI<boss_darkheartAI>(creature);
     }
 };
 
@@ -845,7 +845,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_slitherAI>(creature);
+        return GetZulAmanAI<boss_slitherAI>(creature);
     }
 };
 
@@ -887,7 +887,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_fenstalkerAI>(creature);
+        return GetZulAmanAI<boss_fenstalkerAI>(creature);
     }
 };
 
@@ -935,7 +935,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_koraggAI>(creature);
+        return GetZulAmanAI<boss_koraggAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp

@@ -436,7 +436,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_janalaiAI>(creature);
+        return GetZulAmanAI<boss_janalaiAI>(creature);
     }
 };
 
@@ -471,7 +471,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_janalai_firebombAI(creature);
+        return GetZulAmanAI<npc_janalai_firebombAI>(creature);
     }
 };
 
@@ -603,7 +603,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_janalai_hatcherAI>(creature);
+        return GetZulAmanAI<npc_janalai_hatcherAI>(creature);
     }
 };
 
@@ -662,7 +662,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_janalai_hatchlingAI>(creature);
+        return GetZulAmanAI<npc_janalai_hatchlingAI>(creature);
     }
 };
 
@@ -673,7 +673,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_janalai_eggAI(creature);
+        return GetZulAmanAI<npc_janalai_eggAI>(creature);
     }
 
     struct npc_janalai_eggAI : public ScriptedAI

src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp

@@ -451,7 +451,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_nalorakkAI>(creature);
+        return GetZulAmanAI<boss_nalorakkAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp

@@ -552,7 +552,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_zuljinAI>(creature);
+        return GetZulAmanAI<boss_zuljinAI>(creature);
     }
 };
 
@@ -588,7 +588,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_zuljin_vortexAI(creature);
+        return GetZulAmanAI<npc_zuljin_vortexAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp

@@ -428,7 +428,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_forest_frogAI>(creature);
+        return GetZulAmanAI<npc_forest_frogAI>(creature);
     }
 };
 
@@ -475,7 +475,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_zulaman_hostageAI(creature);
+        return GetZulAmanAI<npc_zulaman_hostageAI>(creature);
     }
 
     bool OnGossipHello(Player* player, Creature* creature) override
@@ -768,7 +768,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_harrison_jonesAI>(creature);
+        return GetZulAmanAI<npc_harrison_jonesAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/ZulAman/zulaman.h

@@ -7,6 +7,10 @@
 #ifndef DEF_ZULAMAN_H
 #define DEF_ZULAMAN_H
 
+#include "CreatureAIImpl.h"
+
+#define ZulAmanScriptName "instance_zulaman"
+
 enum DataTypes
 {
     DATA_GONGEVENT                      = 0,
@@ -46,4 +50,10 @@ enum GameobjectIds
     GO_STRANGE_GONG                     = 187359
 };
 
+template <class AI, class T>
+inline AI* GetZulAmanAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, ZulAmanScriptName);
+}
+
 #endif

src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp

@@ -93,7 +93,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_gahzrankaAI(creature);
+        return GetZulGurubAI<boss_gahzrankaAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp

@@ -94,7 +94,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_grilekAI(creature);
+        return GetZulGurubAI<boss_grilekAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp

@@ -160,7 +160,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_hakkarAI>(creature);
+        return GetZulGurubAI<boss_hakkarAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp

@@ -102,7 +102,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_hazzarahAI(creature);
+        return GetZulGurubAI<boss_hazzarahAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp

@@ -236,7 +236,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_batriderAI(creature);
+        return GetZulGurubAI<npc_batriderAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp

@@ -167,7 +167,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_jindoAI(creature);
+        return GetZulGurubAI<boss_jindoAI>(creature);
     }
 };
 
@@ -218,7 +218,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_healing_wardAI>(creature);
+        return GetZulGurubAI<npc_healing_wardAI>(creature);
     }
 };
 
@@ -261,7 +261,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_shade_of_jindoAI(creature);
+        return GetZulGurubAI<npc_shade_of_jindoAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp

@@ -384,7 +384,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_vilebranch_speakerAI>(creature);
+        return GetZulGurubAI<npc_vilebranch_speakerAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp

@@ -204,7 +204,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_marliAI(creature);
+        return GetZulGurubAI<boss_marliAI>(creature);
     }
 };
 
@@ -249,7 +249,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_spawn_of_marliAI(creature);
+        return GetZulGurubAI<npc_spawn_of_marliAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp

@@ -154,7 +154,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_renatakiAI(creature);
+        return GetZulGurubAI<boss_renatakiAI>(creature);
     }
 };
 

src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp

@@ -239,7 +239,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_thekalAI>(creature);
+        return GetZulGurubAI<boss_thekalAI>(creature);
     }
 };
 
@@ -392,7 +392,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_zealot_lorkhanAI>(creature);
+        return GetZulGurubAI<npc_zealot_lorkhanAI>(creature);
     }
 };
 
@@ -545,7 +545,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_zealot_zathAI>(creature);
+        return GetZulGurubAI<npc_zealot_zathAI>(creature);
     }
 };