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

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);
     }
 };
 

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

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

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

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

src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h

@@ -7,6 +7,8 @@
 #ifndef DEF_ZULGURUB_H
 #define DEF_ZULGURUB_H
 
+#include "CreatureAIImpl.h"
+
 uint32 const EncounterCount = 13;
 
 #define ZGScriptName "instance_zulgurub"
@@ -53,10 +55,10 @@ enum GameobjectIds
     GO_GONG_OF_BETHEKK      = 180526  // Arlokk Event
 };
 
-template<class AI>
-AI* GetZulGurubAI(Creature* creature)
+template <class AI, class T>
+inline AI* GetZulGurubAI(T* obj)
 {
-    return GetInstanceAI<AI>(creature, ZGScriptName);
+    return GetInstanceAI<AI>(obj, ZGScriptName);
 }
 
 #endif