refactor(Packet): Add nice CMSG_PET_ACTION

Author: 0blu

src/game/Handlers/PetHandler.cpp

@@ -32,14 +32,11 @@
 #include "Pet.h"
 #include "Group.h"
 
-void WorldSession::HandlePetAction(WorldPacket& recv_data)
+void WorldSession::HandlePetAction(WorldPackets::Pet::PetAction const& packet)
 {
-    ObjectGuid petGuid;
-    uint32 data;
-    ObjectGuid targetGuid;
-    recv_data >> petGuid;
-    recv_data >> data;
-    recv_data >> targetGuid;
+    ObjectGuid petGuid = packet.petGuid;
+    uint32 data = packet.data;
+    ObjectGuid targetGuid = packet.targetGuid;
 
     uint32 spellid = UNIT_ACTION_BUTTON_ACTION(data);
     uint8 flag = UNIT_ACTION_BUTTON_TYPE(data);             // delete = 0x07 CastSpell = C1

src/game/Server/Packets/Pet.cpp

@@ -5,3 +5,10 @@ void WorldPackets::Pet::QueryPetName::ReadFromWorldPacket(WorldPacket& recv_data
     recv_data >> petNumber;
     recv_data >> petGuid;
 }
+
+void WorldPackets::Pet::PetAction::ReadFromWorldPacket(WorldPacket& recv_data)
+{
+    recv_data >> petGuid;
+    recv_data >> data;
+    recv_data >> targetGuid;
+}

src/game/Server/Packets/Pet.h

@@ -16,6 +16,17 @@ namespace WorldPackets { namespace Pet
         explicit QueryPetName() : ClientPacket(CMSG_PET_NAME_QUERY), petNumber(0) {}
         void ReadFromWorldPacket(WorldPacket& recv_data) override;
     };
+
+    class PetAction final : public ClientPacket
+    {
+    public:
+        ObjectGuid petGuid;
+        uint32 data;
+        ObjectGuid targetGuid;
+
+        explicit PetAction() : ClientPacket(CMSG_PET_ACTION), data(0) {}
+        void ReadFromWorldPacket(WorldPacket& recv_data) override;
+    };
 }} // namespace WorldPackets::Pet
 
 #endif // MANGOS_PACKETS_PET_H

src/game/Server/Protocol/Opcodes.cpp

@@ -470,7 +470,7 @@ constexpr Handlers BuildOpcodeList()
     INVALID_PACKET(SMSG_MOUNTSPECIAL_ANIM,            Reason::SendByServer);
     INVALID_PACKET(SMSG_PET_TAME_FAILURE,             Reason::SendByServer);
     LEGACY_HANDLER(CMSG_PET_SET_ACTION,               STATUS_LOGGEDIN,  PACKET_PROCESS_MAP,           &WorldSession::HandlePetSetAction);
-    LEGACY_HANDLER(CMSG_PET_ACTION,                   STATUS_LOGGEDIN,  PACKET_PROCESS_SPELLS,        &WorldSession::HandlePetAction);
+    DEFINE_HANDLER(CMSG_PET_ACTION,                   STATUS_LOGGEDIN,  PACKET_PROCESS_SPELLS,        &WorldSession::HandlePetAction);
     LEGACY_HANDLER(CMSG_PET_ABANDON,                  STATUS_LOGGEDIN,  PACKET_PROCESS_MAP,           &WorldSession::HandlePetAbandon);
     LEGACY_HANDLER(CMSG_PET_RENAME,                   STATUS_LOGGEDIN,  PACKET_PROCESS_MAP,           &WorldSession::HandlePetRename);
     INVALID_PACKET(SMSG_PET_NAME_INVALID,             Reason::SendByServer);

src/game/Server/WorldSession.h

@@ -763,7 +763,7 @@ class WorldSession
         void HandleTutorialResetOpcode(WorldPacket& recv_data);
 
         //Pet
-        void HandlePetAction(WorldPacket& recv_data);
+        void HandlePetAction(WorldPackets::Pet::PetAction const& packet);
         void HandlePetStopAttack(WorldPacket& recv_data);
         void HandlePetNameQueryOpcode(WorldPackets::Pet::QueryPetName const& packet);
         void HandlePetSetAction(WorldPacket& recv_data);