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

This commit is contained in:
Kitzunu
2021-04-05 15:34:26 +02:00
committed by GitHub
parent 60f865fce6
commit f9d708b450
371 changed files with 1315 additions and 767 deletions

View File

@@ -231,7 +231,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_millhouse_manastormAI(creature);
return GetArcatrazAI<npc_millhouse_manastormAI>(creature);
}
};
@@ -560,7 +560,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_warden_mellicharAI(creature);
return GetArcatrazAI<npc_warden_mellicharAI>(creature);
}
};

View File

@@ -6,9 +6,12 @@
#define ARCATRAZ_H
#include "CreatureAI.h"
#include "CreatureAIImpl.h"
#include "Player.h"
#include "SpellScript.h"
#define ArcatrazScriptName "instance_arcatraz"
enum DataTypes
{
// Encounter States/Boss GUIDs
@@ -54,4 +57,10 @@ enum SpellIds
SPELL_SOUL_STEAL = 36782
};
template <class AI, class T>
inline AI* GetArcatrazAI(T* obj)
{
return GetInstanceAI<AI>(obj, ArcatrazScriptName);
}
#endif // ARCATRAZ_H

View File

@@ -161,7 +161,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_dalliah_the_doomsayerAI(creature);
return GetArcatrazAI<boss_dalliah_the_doomsayerAI>(creature);
}
};

View File

@@ -163,7 +163,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_harbinger_skyrissAI(creature);
return GetArcatrazAI<boss_harbinger_skyrissAI>(creature);
}
};

View File

@@ -242,7 +242,7 @@ public:
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_wrath_scryer_soccothratesAI(creature);
return GetArcatrazAI<boss_wrath_scryer_soccothratesAI>(creature);
}
};

View File

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