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

src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h

@@ -6,6 +6,9 @@
 #define DEF_BLOOD_FURNACE_H
 
 #include "Player.h"
+#include "CreatureAIImpl.h"
+
+#define BloodFurnaceScriptName "instance_blood_furnace"
 
 enum bloodFurnace
 {
@@ -39,4 +42,10 @@ enum bloodFurnaceNPC
     NPC_CHANNELER                       = 17653
 };
 
+template <class AI, class T>
+inline AI* GetBloodFurnaceAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, BloodFurnaceScriptName);
+}
+
 #endif

src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp

@@ -126,7 +126,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_broggokAI(creature);
+        return GetBloodFurnaceAI<boss_broggokAI>(creature);
     }
 };
 

src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp

@@ -265,7 +265,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_kelidan_the_breakerAI(creature);
+        return GetBloodFurnaceAI<boss_kelidan_the_breakerAI>(creature);
     }
 };
 
@@ -336,7 +336,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_shadowmoon_channelerAI(creature);
+        return GetBloodFurnaceAI<npc_shadowmoon_channelerAI>(creature);
     }
 };
 

src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp

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

src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp

@@ -165,7 +165,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_omor_the_unscarredAI>(creature);
+        return GetHellfireRampartsAI<boss_omor_the_unscarredAI>(creature);
     }
 };
 

src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp

@@ -128,7 +128,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_vazruden_the_heraldAI(creature);
+        return GetHellfireRampartsAI<boss_vazruden_the_heraldAI>(creature);
     }
 };
 
@@ -236,7 +236,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_nazanAI(creature);
+        return GetHellfireRampartsAI<boss_nazanAI>(creature);
     }
 };
 
@@ -307,7 +307,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_vazrudenAI(creature);
+        return GetHellfireRampartsAI<boss_vazrudenAI>(creature);
     }
 };
 

src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp

@@ -143,7 +143,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new boss_watchkeeper_gargolmarAI(creature);
+        return GetHellfireRampartsAI<boss_watchkeeper_gargolmarAI>(creature);
     }
 };
 

src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h

@@ -6,6 +6,9 @@
 #define DEF_RAMPARTS_H
 
 #include "SpellScript.h"
+#include "CreatureAIImpl.h"
+
+#define HellfireRampartsScriptName "instance_hellfire_ramparts"
 
 enum DataTypes
 {
@@ -29,4 +32,10 @@ enum GameobjectIds
     GO_FEL_IRON_CHECT_HEROIC    = 185169
 };
 
+template <class AI, class T>
+inline AI* GetHellfireRampartsAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, HellfireRampartsScriptName);
+}
+
 #endif

src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp

@@ -246,7 +246,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_magtheridonAI>(creature);
+        return GetMagtheridonsLairAI<boss_magtheridonAI>(creature);
     }
 };
 

src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h

@@ -6,6 +6,9 @@
 #define DEF_MAGTHERIDONS_LAIR_H
 
 #include "SpellScript.h"
+#include "CreatureAIImpl.h"
+
+#define MagtheridonsLairScriptName "instance_magtheridons_lair"
 
 enum DataTypes
 {
@@ -38,4 +41,10 @@ enum GoIds
     GO_MAGTHERIDON_COLUMN5          = 184639
 };
 
+template <class AI, class T>
+inline AI* GetMagtheridonsLairAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, MagtheridonsLairScriptName);
+}
+
 #endif

src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp

@@ -240,7 +240,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_grand_warlock_nethekurseAI>(creature);
+        return GetShatteredHallsAI<boss_grand_warlock_nethekurseAI>(creature);
     }
 };
 

src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp

@@ -211,7 +211,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_warbringer_omroggAI>(creature);
+        return GetShatteredHallsAI<boss_warbringer_omroggAI>(creature);
     }
 };
 
@@ -248,7 +248,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_omrogg_headsAI>(creature);
+        return GetShatteredHallsAI<npc_omrogg_headsAI>(creature);
     }
 };
 

src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp

@@ -167,7 +167,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_warchief_kargath_bladefistAI>(creature);
+        return GetShatteredHallsAI<boss_warchief_kargath_bladefistAI>(creature);
     }
 };
 

src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h

@@ -5,9 +5,12 @@
 #ifndef DEF_SHATTERED_H
 #define DEF_SHATTERED_H
 
+#include "CreatureAIImpl.h"
 #include "PassiveAI.h"
 #include "SpellScript.h"
 
+#define ShatteredHallsLairScriptName "instance_shattered_halls"
+
 enum DataTypes
 {
     DATA_NETHEKURSE                 = 0,
@@ -51,4 +54,10 @@ enum SpellIds
     SPELL_KARGATHS_EXECUTIONER_3    = 39290
 };
 
+template <class AI, class T>
+inline AI* GetShatteredHallsAI(T* obj)
+{
+    return GetInstanceAI<AI>(obj, ShatteredHallsLairScriptName);
+}
+
 #endif