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

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