Core/Pets: a827230910fd7e3e64bcb5526e2778b8b4752da4 followup reducing differences between branches

2 files changed, 25 insertions, 4 deletions

diff --git a/src/server/game/Server/Packets/PetPackets.cpp b/src/server/game/Server/Packets/PetPackets.cpp
index 1b2ee6532b6..c3d060eb9f6 100755
--- a/src/server/game/Server/Packets/PetPackets.cpp
+++ b/src/server/game/Server/Packets/PetPackets.cpp
@@ -51,10 +51,20 @@ WorldPacket const* WorldPackets::Pet::PetUnlearnedSpell::Write()
     return &_worldPacket;
 }
 
+WorldPacket const* WorldPackets::Pet::PetActionFeedback::Write()
+{
+    _worldPacket << uint8(Response);
+    if (Response == ::PetActionFeedback::NoTarget || Response == ::PetActionFeedback::InvalidTarget)
+        _worldPacket << int32(SpellID);
+
+    return &_worldPacket;
+}
+
 WorldPacket const* WorldPackets::Pet::PetActionSound::Write()
 {
     _worldPacket << UnitGUID;
     _worldPacket << int32(Action);
+
     return &_worldPacket;
 }
 
@@ -62,5 +72,6 @@ WorldPacket const* WorldPackets::Pet::PetDismissSound::Write()
 {
     _worldPacket << int32(ModelId);
     _worldPacket << ModelPosition;
+
     return &_worldPacket;
 }
diff --git a/src/server/game/Server/Packets/PetPackets.h b/src/server/game/Server/Packets/PetPackets.h
index 8893f2497d9..ab9856d1dc1 100755
--- a/src/server/game/Server/Packets/PetPackets.h
+++ b/src/server/game/Server/Packets/PetPackets.h
@@ -19,6 +19,7 @@
 #define PetPackets_h__
 
 #include "Packet.h"
+#include "PetDefines.h"
 #include "Position.h"
 #include "ObjectGuid.h"
 
@@ -96,11 +97,21 @@ namespace WorldPackets
             void Read() override { }
         };
 
+        class PetActionFeedback final : public ServerPacket
+        {
+        public:
+            PetActionFeedback() : ServerPacket(SMSG_PET_ACTION_FEEDBACK, 4 + 1) { }
+
+            WorldPacket const* Write() override;
+
+            int32 SpellID = 0;
+            ::PetActionFeedback Response = ::PetActionFeedback::None;
+        };
+
         class PetActionSound final : public ServerPacket
         {
         public:
-            PetActionSound(ObjectGuid unitGUID, int32 action)
-                : ServerPacket(SMSG_PET_ACTION_SOUND, 8 + 4), UnitGUID(unitGUID), Action(action) { }
+            PetActionSound() : ServerPacket(SMSG_PET_ACTION_SOUND, 8 + 4) { }
 
             WorldPacket const* Write() override;
 
@@ -111,8 +122,7 @@ namespace WorldPackets
         class PetDismissSound final : public ServerPacket
         {
         public:
-            PetDismissSound(int32 modelId, Position modelPosition)
-                : ServerPacket(SMSG_PET_DISMISS_SOUND, 4 + 12), ModelId(modelId), ModelPosition(modelPosition) { }
+            PetDismissSound() : ServerPacket(SMSG_PET_DISMISS_SOUND, 4 + 12) { }
 
             WorldPacket const* Write() override;