Core/DataStores: Load AnimKit.dbc to validate anim kit usage

1 files changed, 9 insertions, 0 deletions

diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index f30d8af21b4..655af613220 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -3107,6 +3107,9 @@ void WorldObject::SetAIAnimKitId(uint16 animKitId)
     if (m_aiAnimKitId == animKitId)
         return;
 
+    if (animKitId && !sAnimKitStore.LookupEntry(animKitId))
+        return;
+
     m_aiAnimKitId = animKitId;
 
     WorldPacket data(SMSG_SET_AI_ANIM_KIT, 8 + 2);
@@ -3120,6 +3123,9 @@ void WorldObject::SetMovementAnimKitId(uint16 animKitId)
     if (m_movementAnimKitId == animKitId)
         return;
 
+    if (animKitId && !sAnimKitStore.LookupEntry(animKitId))
+        return;
+
     m_movementAnimKitId = animKitId;
 
     WorldPacket data(SMSG_SET_MOVEMENT_ANIM_KIT, 8 + 2);
@@ -3133,6 +3139,9 @@ void WorldObject::SetMeleeAnimKitId(uint16 animKitId)
     if (m_meleeAnimKitId == animKitId)
         return;
 
+    if (animKitId && !sAnimKitStore.LookupEntry(animKitId))
+        return;
+
     m_meleeAnimKitId = animKitId;
 
     WorldPacket data(SMSG_SET_MELEE_ANIM_KIT, 8 + 2);