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

src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp

@@ -100,7 +100,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_bjarngrimAI (creature);
+        return GetHallsOfLightningAI<boss_bjarngrimAI>(creature);
     }
 
     struct boss_bjarngrimAI : public npc_escortAI
@@ -364,7 +364,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_stormforged_lieutenantAI (creature);
+        return GetHallsOfLightningAI<npc_stormforged_lieutenantAI>(creature);
     }
 
     struct npc_stormforged_lieutenantAI : public ScriptedAI

src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp

@@ -59,7 +59,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_ionarAI (creature);
+        return GetHallsOfLightningAI<boss_ionarAI>(creature);
     }
 
     struct boss_ionarAI : public ScriptedAI
@@ -220,7 +220,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_spark_of_ionarAI (creature);
+        return GetHallsOfLightningAI<npc_spark_of_ionarAI>(creature);
     }
 
     struct npc_spark_of_ionarAI : public ScriptedAI

src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp

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

src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp

@@ -72,7 +72,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_volkhanAI (creature);
+        return GetHallsOfLightningAI<boss_volkhanAI>(creature);
     }
 
     struct boss_volkhanAI : public ScriptedAI
@@ -313,7 +313,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_molten_golemAI (creature);
+        return GetHallsOfLightningAI<npc_molten_golemAI>(creature);
     }
 
     struct npc_molten_golemAI : public ScriptedAI
@@ -437,7 +437,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_hol_monumentAI(creature);
+        return GetHallsOfLightningAI<npc_hol_monumentAI>(creature);
     }
 
     struct npc_hol_monumentAI : public ScriptedAI

src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h

@@ -5,6 +5,10 @@
 #ifndef DEF_HALLS_OF_LIGHTNING_H
 #define DEF_HALLS_OF_LIGHTNING_H
 
+#include "CreatureAIImpl.h"
+
+#define HallsOfLightningScriptName "instance_halls_of_lightning"
+
 enum HoLEvents
 {
     TYPE_BJARNGRIM          = 0,
@@ -35,4 +39,10 @@ enum HoLGOs
     GO_LOKEN_THRONE         = 192654,
 };
 
+template <class AI, class T>
+inline AI* GetHallsOfLightningAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, HallsOfLightningScriptName);
+}
+
 #endif

src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp

@@ -47,7 +47,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_krystallusAI (pCreature);
+        return GetHallsOfStoneAI<boss_krystallusAI>(pCreature);
     }
 
     struct boss_krystallusAI : public ScriptedAI

src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp

@@ -40,7 +40,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_maiden_of_griefAI (pCreature);
+        return GetHallsOfStoneAI<boss_maiden_of_griefAI>(pCreature);
     }
 
     struct boss_maiden_of_griefAI : public ScriptedAI

src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp

@@ -98,7 +98,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_sjonnirAI (pCreature);
+        return GetHallsOfStoneAI<boss_sjonnirAI>(pCreature);
     }
 
     struct boss_sjonnirAI : public ScriptedAI
@@ -379,7 +379,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_sjonnir_dwarfAI (pCreature);
+        return GetHallsOfStoneAI<boss_sjonnir_dwarfAI>(pCreature);
     }
 
     struct boss_sjonnir_dwarfAI : public ScriptedAI
@@ -403,7 +403,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_sjonnir_iron_sludgeAI (pCreature);
+        return GetHallsOfStoneAI<boss_sjonnir_iron_sludgeAI>(pCreature);
     }
 
     struct boss_sjonnir_iron_sludgeAI : public ScriptedAI
@@ -459,7 +459,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_sjonnir_malformed_oozeAI (pCreature);
+        return GetHallsOfStoneAI<boss_sjonnir_malformed_oozeAI>(pCreature);
     }
 
     struct boss_sjonnir_malformed_oozeAI : public ScriptedAI

src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h

@@ -5,6 +5,10 @@
 #ifndef DEF_HALLS_OF_STONE_H
 #define DEF_HALLS_OF_STONE_H
 
+#include "CreatureAIImpl.h"
+
+#define HallsOfStoneScriptName "instance_halls_of_stone"
+
 enum Encounter
 {
     BOSS_KRYSTALLUS             = 0,
@@ -44,4 +48,10 @@ enum npcs
     NPC_BRANN                   = 28070,
 };
 
+template <class AI, class T>
+inline AI* GetHallsOfStoneAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, HallsOfStoneScriptName);
+}
+
 #endif

src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp

@@ -793,7 +793,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_algalon_the_observerAI(creature);
+        return GetUlduarAI<boss_algalon_the_observerAI>(creature);
     }
 };
 
@@ -891,7 +891,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_brann_bronzebeard_algalonAI(creature);
+        return GetUlduarAI<npc_brann_bronzebeard_algalonAI>(creature);
     }
 };
 
@@ -927,7 +927,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_collapsing_starAI(creature);
+        return GetUlduarAI<npc_collapsing_starAI>(creature);
     }
 };
 
@@ -1018,7 +1018,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_living_constellationAI(creature);
+        return GetUlduarAI<npc_living_constellationAI>(creature);
     }
 };
 
@@ -1066,7 +1066,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_algalon_worm_holeAI(creature);
+        return GetUlduarAI<npc_algalon_worm_holeAI>(creature);
     }
 };
 

src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp

@@ -184,7 +184,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_steelbreakerAI (pCreature);
+        return GetUlduarAI<boss_steelbreakerAI>(pCreature);
     }
 
     struct boss_steelbreakerAI : public ScriptedAI
@@ -375,7 +375,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_runemaster_molgeimAI (pCreature);
+        return GetUlduarAI<boss_runemaster_molgeimAI>(pCreature);
     }
 
     struct boss_runemaster_molgeimAI : public ScriptedAI
@@ -540,7 +540,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_assembly_lightningAI (pCreature);
+        return GetUlduarAI<npc_assembly_lightningAI>(pCreature);
     }
 
     struct npc_assembly_lightningAI : public ScriptedAI
@@ -585,7 +585,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_stormcaller_brundirAI (pCreature);
+        return GetUlduarAI<boss_stormcaller_brundirAI>(pCreature);
     }
 
     struct boss_stormcaller_brundirAI : public ScriptedAI

src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp

@@ -95,7 +95,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_auriayaAI (pCreature);
+        return GetUlduarAI<boss_auriayaAI>(pCreature);
     }
 
     struct boss_auriayaAI : public ScriptedAI
@@ -278,7 +278,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_auriaya_sanctum_sentryAI (pCreature);
+        return GetUlduarAI<npc_auriaya_sanctum_sentryAI>(pCreature);
     }
 
     struct npc_auriaya_sanctum_sentryAI : public ScriptedAI
@@ -340,7 +340,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_auriaya_feral_defenderAI (pCreature);
+        return GetUlduarAI<npc_auriaya_feral_defenderAI>(pCreature);
     }
 
     struct npc_auriaya_feral_defenderAI : public ScriptedAI

src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp

@@ -179,7 +179,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_flame_leviathanAI (pCreature);
+        return GetUlduarAI<boss_flame_leviathanAI>(pCreature);
     }
 
     struct boss_flame_leviathanAI : public ScriptedAI
@@ -691,7 +691,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_flame_leviathan_seatAI (pCreature);
+        return GetUlduarAI<boss_flame_leviathan_seatAI>(pCreature);
     }
 
     struct boss_flame_leviathan_seatAI : public VehicleAI
@@ -832,7 +832,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_flame_leviathan_defense_turretAI(creature);
+        return GetUlduarAI<boss_flame_leviathan_defense_turretAI>(creature);
     }
 };
 
@@ -868,7 +868,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_flame_leviathan_overload_deviceAI(creature);
+        return GetUlduarAI<boss_flame_leviathan_overload_deviceAI>(creature);
     }
 };
 
@@ -879,7 +879,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_freya_wardAI (pCreature);
+        return GetUlduarAI<npc_freya_wardAI>(pCreature);
     }
 
     struct npc_freya_wardAI : public NullCreatureAI
@@ -959,7 +959,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_hodirs_furyAI (pCreature);
+        return GetUlduarAI<npc_hodirs_furyAI>(pCreature);
     }
 
     struct npc_hodirs_furyAI : public NullCreatureAI
@@ -1038,7 +1038,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_mimirons_infernoAI(creature);
+        return GetUlduarAI<npc_mimirons_infernoAI>(creature);
     }
 
     struct npc_mimirons_infernoAI : public npc_escortAI
@@ -1100,7 +1100,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_thorims_hammerAI (pCreature);
+        return GetUlduarAI<npc_thorims_hammerAI>(pCreature);
     }
 
     struct npc_thorims_hammerAI : public NullCreatureAI
@@ -1156,7 +1156,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_pool_of_tarAI (pCreature);
+        return GetUlduarAI<npc_pool_of_tarAI>(pCreature);
     }
 
     struct npc_pool_of_tarAI : public NullCreatureAI
@@ -1204,7 +1204,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_brann_radioAI (pCreature);
+        return GetUlduarAI<npc_brann_radioAI>(pCreature);
     }
 
     struct npc_brann_radioAI : public NullCreatureAI
@@ -1309,7 +1309,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_storm_beacon_spawnAI (pCreature);
+        return GetUlduarAI<npc_storm_beacon_spawnAI>(pCreature);
     }
 
     struct npc_storm_beacon_spawnAI : public NullCreatureAI
@@ -1350,7 +1350,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_flame_leviathan_safety_containerAI (pCreature);
+        return GetUlduarAI<boss_flame_leviathan_safety_containerAI>(pCreature);
     }
 
     struct boss_flame_leviathan_safety_containerAI : public NullCreatureAI
@@ -1398,7 +1398,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_mechanoliftAI (pCreature);
+        return GetUlduarAI<npc_mechanoliftAI>(pCreature);
     }
 
     struct npc_mechanoliftAI : public NullCreatureAI

src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp

@@ -249,7 +249,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_freyaAI (pCreature);
+        return GetUlduarAI<boss_freyaAI>(pCreature);
     }
 
     struct boss_freyaAI : public ScriptedAI
@@ -669,7 +669,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_freya_elder_stonebarkAI (pCreature);
+        return GetUlduarAI<boss_freya_elder_stonebarkAI>(pCreature);
     }
 
     struct boss_freya_elder_stonebarkAI : public ScriptedAI
@@ -775,7 +775,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_freya_elder_brightleafAI (pCreature);
+        return GetUlduarAI<boss_freya_elder_brightleafAI>(pCreature);
     }
 
     struct boss_freya_elder_brightleafAI : public ScriptedAI
@@ -898,7 +898,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_freya_elder_ironbranchAI (pCreature);
+        return GetUlduarAI<boss_freya_elder_ironbranchAI>(pCreature);
     }
 
     struct boss_freya_elder_ironbranchAI : public ScriptedAI
@@ -992,7 +992,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_freya_iron_rootAI (pCreature);
+        return GetUlduarAI<boss_freya_iron_rootAI>(pCreature);
     }
 
     struct boss_freya_iron_rootAI : public NullCreatureAI
@@ -1022,7 +1022,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_freya_lifebinderAI (pCreature);
+        return GetUlduarAI<boss_freya_lifebinderAI>(pCreature);
     }
 
     struct boss_freya_lifebinderAI : public NullCreatureAI
@@ -1062,7 +1062,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_freya_healthy_sporeAI (pCreature);
+        return GetUlduarAI<boss_freya_healthy_sporeAI>(pCreature);
     }
 
     struct boss_freya_healthy_sporeAI : public NullCreatureAI
@@ -1101,7 +1101,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_freya_summonsAI (pCreature);
+        return GetUlduarAI<boss_freya_summonsAI>(pCreature);
     }
 
     struct boss_freya_summonsAI : public ScriptedAI
@@ -1244,7 +1244,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_freya_nature_bombAI (pCreature);
+        return GetUlduarAI<boss_freya_nature_bombAI>(pCreature);
     }
 
     struct boss_freya_nature_bombAI : public NullCreatureAI

src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp

@@ -101,7 +101,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_vezaxAI (pCreature);
+        return GetUlduarAI<boss_vezaxAI>(pCreature);
     }
 
     struct boss_vezaxAI : public ScriptedAI
@@ -394,7 +394,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_saronite_vaporsAI (pCreature);
+        return GetUlduarAI<npc_ulduar_saronite_vaporsAI>(pCreature);
     }
 
     struct npc_ulduar_saronite_vaporsAI : public NullCreatureAI
@@ -426,7 +426,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_saronite_animusAI (pCreature);
+        return GetUlduarAI<npc_ulduar_saronite_animusAI>(pCreature);
     }
 
     struct npc_ulduar_saronite_animusAI : public ScriptedAI

src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp

@@ -193,7 +193,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_hodirAI (pCreature);
+        return GetUlduarAI<boss_hodirAI>(pCreature);
     }
 
     struct boss_hodirAI : public ScriptedAI
@@ -595,7 +595,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_icicleAI (pCreature);
+        return GetUlduarAI<npc_ulduar_icicleAI>(pCreature);
     }
 
     struct npc_ulduar_icicleAI : public NullCreatureAI
@@ -638,7 +638,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_flash_freezeAI (pCreature);
+        return GetUlduarAI<npc_ulduar_flash_freezeAI>(pCreature);
     }
 
     struct npc_ulduar_flash_freezeAI : public NullCreatureAI
@@ -698,7 +698,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_toasty_fireAI (pCreature);
+        return GetUlduarAI<npc_ulduar_toasty_fireAI>(pCreature);
     }
 
     struct npc_ulduar_toasty_fireAI : public NullCreatureAI
@@ -741,7 +741,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_hodir_priestAI (pCreature);
+        return GetUlduarAI<npc_ulduar_hodir_priestAI>(pCreature);
     }
 
     struct npc_ulduar_hodir_priestAI : public ScriptedAI
@@ -838,7 +838,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_hodir_druidAI (pCreature);
+        return GetUlduarAI<npc_ulduar_hodir_druidAI>(pCreature);
     }
 
     struct npc_ulduar_hodir_druidAI : public ScriptedAI
@@ -935,7 +935,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_hodir_shamanAI (pCreature);
+        return GetUlduarAI<npc_ulduar_hodir_shamanAI>(pCreature);
     }
 
     struct npc_ulduar_hodir_shamanAI : public ScriptedAI
@@ -1035,7 +1035,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_hodir_mageAI (pCreature);
+        return GetUlduarAI<npc_ulduar_hodir_mageAI>(pCreature);
     }
 
     struct npc_ulduar_hodir_mageAI : public ScriptedAI

src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp

@@ -83,7 +83,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_iron_constructAI (pCreature);
+        return GetUlduarAI<npc_ulduar_iron_constructAI>(pCreature);
     }
 
     struct npc_ulduar_iron_constructAI : public ScriptedAI
@@ -191,7 +191,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_ignisAI (pCreature);
+        return GetUlduarAI<boss_ignisAI>(pCreature);
     }
 
     struct boss_ignisAI : public ScriptedAI

src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp

@@ -132,7 +132,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_kologarnAI (pCreature);
+        return GetUlduarAI<boss_kologarnAI>(pCreature);
     }
 
     struct boss_kologarnAI : public ScriptedAI
@@ -487,7 +487,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_kologarn_armsAI (pCreature);
+        return GetUlduarAI<boss_kologarn_armsAI>(pCreature);
     }
 
     struct boss_kologarn_armsAI : public ScriptedAI
@@ -587,7 +587,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_kologarn_eyebeamAI (pCreature);
+        return GetUlduarAI<boss_kologarn_eyebeamAI>(pCreature);
     }
     struct boss_kologarn_eyebeamAI : public ScriptedAI
     {

src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp

@@ -279,7 +279,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_mimironAI (pCreature);
+        return GetUlduarAI<boss_mimironAI>(pCreature);
     }
 
     struct boss_mimironAI : public ScriptedAI
@@ -986,7 +986,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_leviathan_mkiiAI (pCreature);
+        return GetUlduarAI<npc_ulduar_leviathan_mkiiAI>(pCreature);
     }
 
     struct npc_ulduar_leviathan_mkiiAI : public ScriptedAI
@@ -1268,7 +1268,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_vx001AI (pCreature);
+        return GetUlduarAI<npc_ulduar_vx001AI>(pCreature);
     }
 
     struct npc_ulduar_vx001AI : public ScriptedAI
@@ -1613,7 +1613,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_aerial_command_unitAI (pCreature);
+        return GetUlduarAI<npc_ulduar_aerial_command_unitAI>(pCreature);
     }
 
     struct npc_ulduar_aerial_command_unitAI : public ScriptedAI
@@ -1942,7 +1942,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_proximity_mineAI (pCreature);
+        return GetUlduarAI<npc_ulduar_proximity_mineAI>(pCreature);
     }
 
     struct npc_ulduar_proximity_mineAI : public ScriptedAI
@@ -2007,7 +2007,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_mimiron_rocketAI (pCreature);
+        return GetUlduarAI<npc_ulduar_mimiron_rocketAI>(pCreature);
     }
 
     struct npc_ulduar_mimiron_rocketAI : public NullCreatureAI
@@ -2050,7 +2050,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_magnetic_coreAI (pCreature);
+        return GetUlduarAI<npc_ulduar_magnetic_coreAI>(pCreature);
     }
 
     struct npc_ulduar_magnetic_coreAI : public NullCreatureAI
@@ -2099,7 +2099,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_bot_summon_triggerAI (pCreature);
+        return GetUlduarAI<npc_ulduar_bot_summon_triggerAI>(pCreature);
     }
 
     struct npc_ulduar_bot_summon_triggerAI : public NullCreatureAI
@@ -2275,7 +2275,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_flames_initialAI (pCreature);
+        return GetUlduarAI<npc_ulduar_flames_initialAI>(pCreature);
     }
 
     struct npc_ulduar_flames_initialAI : public NullCreatureAI
@@ -2395,7 +2395,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_flames_spreadAI (pCreature);
+        return GetUlduarAI<npc_ulduar_flames_spreadAI>(pCreature);
     }
 
     struct npc_ulduar_flames_spreadAI : public NullCreatureAI
@@ -2437,7 +2437,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_emergency_fire_botAI (pCreature);
+        return GetUlduarAI<npc_ulduar_emergency_fire_botAI>(pCreature);
     }
 
     struct npc_ulduar_emergency_fire_botAI : public ScriptedAI
@@ -2494,7 +2494,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_rocket_strike_triggerAI (pCreature);
+        return GetUlduarAI<npc_ulduar_rocket_strike_triggerAI>(pCreature);
     }
 
     struct npc_ulduar_rocket_strike_triggerAI : public NullCreatureAI

src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp

@@ -113,7 +113,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_razorscaleAI (pCreature);
+        return GetUlduarAI<boss_razorscaleAI>(pCreature);
     }
 
     struct boss_razorscaleAI : public ScriptedAI
@@ -640,7 +640,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_ulduar_expedition_commanderAI>(creature);
+        return GetUlduarAI<npc_ulduar_expedition_commanderAI>(creature);
     }
 
     struct npc_ulduar_expedition_commanderAI : public NullCreatureAI
@@ -677,7 +677,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_harpoonfirestateAI (pCreature);
+        return GetUlduarAI<npc_ulduar_harpoonfirestateAI>(pCreature);
     }
 
     struct npc_ulduar_harpoonfirestateAI : public NullCreatureAI
@@ -777,7 +777,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_expedition_engineerAI (pCreature);
+        return GetUlduarAI<npc_ulduar_expedition_engineerAI>(pCreature);
     }
 
     struct npc_ulduar_expedition_engineerAI : public NullCreatureAI
@@ -941,7 +941,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_dark_rune_guardianAI (pCreature);
+        return GetUlduarAI<npc_ulduar_dark_rune_guardianAI>(pCreature);
     }
 
     struct npc_ulduar_dark_rune_guardianAI : public ScriptedAI
@@ -988,7 +988,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_dark_rune_watcherAI (pCreature);
+        return GetUlduarAI<npc_ulduar_dark_rune_watcherAI>(pCreature);
     }
 
     struct npc_ulduar_dark_rune_watcherAI : public ScriptedAI
@@ -1044,7 +1044,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_ulduar_dark_rune_sentinelAI (pCreature);
+        return GetUlduarAI<npc_ulduar_dark_rune_sentinelAI>(pCreature);
     }
 
     struct npc_ulduar_dark_rune_sentinelAI : public ScriptedAI

src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp

@@ -308,7 +308,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_thorimAI (pCreature);
+        return GetUlduarAI<boss_thorimAI>(pCreature);
     }
 
     struct boss_thorimAI : public ScriptedAI
@@ -818,7 +818,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_thorim_sifAI (pCreature);
+        return GetUlduarAI<boss_thorim_sifAI>(pCreature);
     }
 
     struct boss_thorim_sifAI : public ScriptedAI
@@ -929,7 +929,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_thorim_lightning_orbAI (pCreature);
+        return GetUlduarAI<boss_thorim_lightning_orbAI>(pCreature);
     }
 
     struct boss_thorim_lightning_orbAI : public npc_escortAI
@@ -977,7 +977,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_thorim_trapAI (pCreature);
+        return GetUlduarAI<boss_thorim_trapAI>(pCreature);
     }
 
     struct boss_thorim_trapAI : public NullCreatureAI
@@ -1015,7 +1015,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_thorim_sif_blizzardAI (pCreature);
+        return GetUlduarAI<boss_thorim_sif_blizzardAI>(pCreature);
     }
 
     struct boss_thorim_sif_blizzardAI : public npc_escortAI
@@ -1064,7 +1064,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_thorim_pillarAI (pCreature);
+        return GetUlduarAI<boss_thorim_pillarAI>(pCreature);
     }
 
     struct boss_thorim_pillarAI : public NullCreatureAI
@@ -1107,7 +1107,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_thorim_start_npcsAI (pCreature);
+        return GetUlduarAI<boss_thorim_start_npcsAI>(pCreature);
     }
 
     struct boss_thorim_start_npcsAI : public ScriptedAI
@@ -1261,7 +1261,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_thorim_gauntlet_npcsAI (pCreature);
+        return GetUlduarAI<boss_thorim_gauntlet_npcsAI>(pCreature);
     }
 
     struct boss_thorim_gauntlet_npcsAI : public ScriptedAI
@@ -1368,7 +1368,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_thorim_runic_colossusAI (pCreature);
+        return GetUlduarAI<boss_thorim_runic_colossusAI>(pCreature);
     }
 
     struct boss_thorim_runic_colossusAI : public ScriptedAI
@@ -1502,7 +1502,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_thorim_ancient_rune_giantAI (pCreature);
+        return GetUlduarAI<boss_thorim_ancient_rune_giantAI>(pCreature);
     }
 
     struct boss_thorim_ancient_rune_giantAI : public ScriptedAI
@@ -1587,7 +1587,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_thorim_arena_npcsAI (pCreature);
+        return GetUlduarAI<boss_thorim_arena_npcsAI>(pCreature);
     }
 
     struct boss_thorim_arena_npcsAI : public ScriptedAI

src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp

@@ -112,7 +112,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_xt002AI (pCreature);
+        return GetUlduarAI<boss_xt002AI>(pCreature);
     }
 
     struct boss_xt002AI : public ScriptedAI
@@ -401,7 +401,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_xt002_heartAI (pCreature);
+        return GetUlduarAI<npc_xt002_heartAI>(pCreature);
     }
 
     struct npc_xt002_heartAI : public PassiveAI
@@ -551,7 +551,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_xt002_scrapbotAI (pCreature);
+        return GetUlduarAI<npc_xt002_scrapbotAI>(pCreature);
     }
 
     struct npc_xt002_scrapbotAI : public PassiveAI
@@ -634,7 +634,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_xt002_pummellerAI (pCreature);
+        return GetUlduarAI<npc_xt002_pummellerAI>(pCreature);
     }
 
     struct npc_xt002_pummellerAI : public ScriptedAI
@@ -720,7 +720,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_xt002_boombotAI (pCreature);
+        return GetUlduarAI<npc_xt002_boombotAI>(pCreature);
     }
 
     struct npc_xt002_boombotAI : public PassiveAI
@@ -821,7 +821,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new npc_xt002_life_sparkAI (pCreature);
+        return GetUlduarAI<npc_xt002_life_sparkAI>(pCreature);
     }
 
     struct npc_xt002_life_sparkAI : public ScriptedAI

src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp

@@ -326,7 +326,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_yoggsaron_saraAI (pCreature);
+        return GetUlduarAI<boss_yoggsaron_saraAI>(pCreature);
     }
 
     struct boss_yoggsaron_saraAI : public ScriptedAI
@@ -874,7 +874,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_yoggsaron_cloudAI (pCreature);
+        return GetUlduarAI<boss_yoggsaron_cloudAI>(pCreature);
     }
 
     struct boss_yoggsaron_cloudAI : public npc_escortAI
@@ -970,7 +970,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_yoggsaron_guardian_of_ysAI (pCreature);
+        return GetUlduarAI<boss_yoggsaron_guardian_of_ysAI>(pCreature);
     }
 
     struct boss_yoggsaron_guardian_of_ysAI : public ScriptedAI
@@ -1014,7 +1014,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_yoggsaronAI (pCreature);
+        return GetUlduarAI<boss_yoggsaronAI>(pCreature);
     }
 
     struct boss_yoggsaronAI : public ScriptedAI
@@ -1197,7 +1197,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_yoggsaron_brainAI (pCreature);
+        return GetUlduarAI<boss_yoggsaron_brainAI>(pCreature);
     }
 
     struct boss_yoggsaron_brainAI : public NullCreatureAI
@@ -1433,7 +1433,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_yoggsaron_death_orbAI (pCreature);
+        return GetUlduarAI<boss_yoggsaron_death_orbAI>(pCreature);
     }
 
     struct boss_yoggsaron_death_orbAI : public NullCreatureAI
@@ -1473,7 +1473,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_yoggsaron_crusher_tentacleAI (pCreature);
+        return GetUlduarAI<boss_yoggsaron_crusher_tentacleAI>(pCreature);
     }
 
     struct boss_yoggsaron_crusher_tentacleAI : public ScriptedAI
@@ -1535,7 +1535,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_yoggsaron_corruptor_tentacleAI (pCreature);
+        return GetUlduarAI<boss_yoggsaron_corruptor_tentacleAI>(pCreature);
     }
 
     struct boss_yoggsaron_corruptor_tentacleAI : public ScriptedAI
@@ -1592,7 +1592,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_yoggsaron_constrictor_tentacleAI (pCreature);
+        return GetUlduarAI<boss_yoggsaron_constrictor_tentacleAI>(pCreature);
     }
 
     struct boss_yoggsaron_constrictor_tentacleAI : public ScriptedAI
@@ -1671,7 +1671,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_yoggsaron_keeperAI (pCreature);
+        return GetUlduarAI<boss_yoggsaron_keeperAI>(pCreature);
     }
 
     struct boss_yoggsaron_keeperAI : public NullCreatureAI
@@ -1747,7 +1747,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_yoggsaron_influence_tentacleAI (pCreature);
+        return GetUlduarAI<boss_yoggsaron_influence_tentacleAI>(pCreature);
     }
 
     struct boss_yoggsaron_influence_tentacleAI : public NullCreatureAI
@@ -1779,7 +1779,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_yoggsaron_immortal_guardianAI (pCreature);
+        return GetUlduarAI<boss_yoggsaron_immortal_guardianAI>(pCreature);
     }
 
     struct boss_yoggsaron_immortal_guardianAI : public ScriptedAI
@@ -1867,7 +1867,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_yoggsaron_lich_kingAI (pCreature);
+        return GetUlduarAI<boss_yoggsaron_lich_kingAI>(pCreature);
     }
 
     struct boss_yoggsaron_lich_kingAI : public NullCreatureAI
@@ -1981,7 +1981,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_yoggsaron_llaneAI (pCreature);
+        return GetUlduarAI<boss_yoggsaron_llaneAI>(pCreature);
     }
 
     struct boss_yoggsaron_llaneAI : public NullCreatureAI
@@ -2103,7 +2103,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_yoggsaron_neltharionAI (pCreature);
+        return GetUlduarAI<boss_yoggsaron_neltharionAI>(pCreature);
     }
 
     struct boss_yoggsaron_neltharionAI : public ScriptedAI
@@ -2211,7 +2211,7 @@ public:
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return new boss_yoggsaron_voiceAI (pCreature);
+        return GetUlduarAI<boss_yoggsaron_voiceAI>(pCreature);
     }
 
     struct boss_yoggsaron_voiceAI : public NullCreatureAI

src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp

@@ -94,7 +94,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_ulduar_snow_moundAI(creature);
+        return GetUlduarAI<npc_ulduar_snow_moundAI>(creature);
     }
 
     struct npc_ulduar_snow_moundAI : public ScriptedAI
@@ -141,7 +141,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_ulduar_storm_tempered_keeperAI(creature);
+        return GetUlduarAI<npc_ulduar_storm_tempered_keeperAI>(creature);
     }
 
     struct npc_ulduar_storm_tempered_keeperAI : public ScriptedAI
@@ -230,7 +230,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_ulduar_arachnopod_destroyerAI(creature);
+        return GetUlduarAI<npc_ulduar_arachnopod_destroyerAI>(creature);
     }
 
     struct npc_ulduar_arachnopod_destroyerAI : public ScriptedAI

src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h

@@ -7,9 +7,12 @@
 
 #include "CellImpl.h"
 #include "Chat.h"
+#include "CreatureAIImpl.h"
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
 
+#define UlduarScriptName "instance_ulduar"
+
 enum UlduarEncounters
 {
     MAX_ENCOUNTER                           = 15,
@@ -279,4 +282,10 @@ enum UlduarMisc
 Position const AlgalonSummonPos = {1632.531f, -304.8516f, 450.1123f, 1.530165f};
 Position const AlgalonLandPos   = {1632.668f, -302.7656f, 417.3211f, 1.530165f};
 
+template <class AI, class T>
+inline AI* GetUlduarAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, UlduarScriptName);
+}
+
 #endif