Core/Scripts: SMSG_PLAY_ONE_SHOT_ANIM_KIT corrections. Thx to Arci

2 files changed, 12 insertions, 9 deletions

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 8b26988726d..cd0213c0f58 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -13429,6 +13429,17 @@ void Unit::SendDurabilityLoss(Player* receiver, uint32 percent)
     receiver->GetSession()->SendPacket(packet.Write());
 }
 
+void Unit::PlayOneShotAnimKitId(uint16 animKitId)
+{
+    if (animKitId && !sAnimKitStore.LookupEntry(animKitId))
+        return;
+
+    WorldPackets::Misc::PlayOneShotAnimKit data;
+    data.Unit = GetGUID();
+    data.AnimKitID = animKitId;
+    SendMessageToSet(data.Write(), true);
+}
+
 void Unit::SetAIAnimKitId(uint16 animKitId)
 {
     if (_aiAnimKitId == animKitId)
@@ -13477,14 +13488,6 @@ void Unit::SetMeleeAnimKitId(uint16 animKitId)
     SendMessageToSet(data.Write(), true);
 }
 
-void Unit::PlayOneShotAnimKit(uint16 animKitId)
-{
-    WorldPacket data(SMSG_PLAY_ONE_SHOT_ANIM_KIT, 7+2);
-    data << GetPackGUID();
-    data << uint16(animKitId);
-    SendMessageToSet(&data, true);
-}
-
 void Unit::Kill(Unit* victim, bool durabilityLoss)
 {
     // Prevent killing unit twice (and giving reward from kill twice)
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index 3ef6800c7e7..4c945365640 100644
--- a/src/server/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
@@ -1499,13 +1499,13 @@ class Unit : public WorldObject
         MountCapabilityEntry const* GetMountCapability(uint32 mountType) const;
 
         void SendDurabilityLoss(Player* receiver, uint32 percent);
+        void PlayOneShotAnimKitId(uint16 animKitId);
         void SetAIAnimKitId(uint16 animKitId);
         uint16 GetAIAnimKitId() const override { return _aiAnimKitId; }
         void SetMovementAnimKitId(uint16 animKitId);
         uint16 GetMovementAnimKitId() const override { return _movementAnimKitId; }
         void SetMeleeAnimKitId(uint16 animKitId);
         uint16 GetMeleeAnimKitId() const override { return _meleeAnimKitId; }
-        void PlayOneShotAnimKit(uint16 animKitId);
 
         uint16 GetMaxSkillValueForLevel(Unit const* target = NULL) const { return (target ? getLevelForTarget(target) : getLevel()) * 5; }
         void DealDamageMods(Unit* victim, uint32 &damage, uint32* absorb);