aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNoName <322016+Faq@users.noreply.github.com>2020-04-11 19:49:44 +0300
committerGitHub <noreply@github.com>2020-04-11 18:49:44 +0200
commitf9d9440577dab0c01c23e43fd1808401e837727c (patch)
tree086c20b353decc791c2a9e061ec0267f9b94537b /src
parent9cde3ffd1404e784406f385061f4df0f6b429b61 (diff)
Core/PacketIO: Updated CMSG_REQUEST_PET_INFO (#24420)
cherry-picked fd162fb6046ba399d12f71a69905dbc3503ae58e Co-authored-by: Carbenium <carbenium@outlook.com>
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Handlers/PetHandler.cpp2
-rwxr-xr-xsrc/server/game/Server/Packets/PetPackets.h9
-rw-r--r--src/server/game/Server/Protocol/Opcodes.cpp2
-rw-r--r--src/server/game/Server/WorldSession.h3
4 files changed, 13 insertions, 3 deletions
diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp
index 4a68a7c2d16..dd3672697cd 100644
--- a/src/server/game/Handlers/PetHandler.cpp
+++ b/src/server/game/Handlers/PetHandler.cpp
@@ -898,7 +898,7 @@ void WorldSession::HandleLearnPreviewTalentsPet(WorldPacket& recvData)
recvData.rfinish();
}
-void WorldSession::HandleRequestPetInfoOpcode(WorldPacket& /*recvPacket*/)
+void WorldSession::HandleRequestPetInfo(WorldPackets::Pet::RequestPetInfo& /*packet*/)
{
// Handle the packet CMSG_REQUEST_PET_INFO - sent when player does ingame /reload command
diff --git a/src/server/game/Server/Packets/PetPackets.h b/src/server/game/Server/Packets/PetPackets.h
index 120cdade5a6..f953f5ff57b 100755
--- a/src/server/game/Server/Packets/PetPackets.h
+++ b/src/server/game/Server/Packets/PetPackets.h
@@ -34,6 +34,15 @@ namespace WorldPackets
ObjectGuid CritterGUID;
};
+
+ class RequestPetInfo final : public ClientPacket
+ {
+ public:
+ RequestPetInfo(WorldPacket&& packet) : ClientPacket(CMSG_REQUEST_PET_INFO, std::move(packet)) { }
+
+ void Read() override { }
+ };
}
}
+
#endif // PetPackets_h__
diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp
index 8dffc86d4c3..ecc5fa52fc8 100644
--- a/src/server/game/Server/Protocol/Opcodes.cpp
+++ b/src/server/game/Server/Protocol/Opcodes.cpp
@@ -761,7 +761,7 @@ void OpcodeTable::Initialize()
/*0x276*/ DEFINE_HANDLER(MSG_QUEST_PUSH_RESULT, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleQuestPushResult );
/*0x277*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAY_MUSIC, STATUS_NEVER);
/*0x278*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAY_OBJECT_SOUND, STATUS_NEVER);
- /*0x279*/ DEFINE_HANDLER(CMSG_REQUEST_PET_INFO, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRequestPetInfoOpcode );
+ /*0x279*/ DEFINE_HANDLER(CMSG_REQUEST_PET_INFO, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRequestPetInfo);
/*0x27A*/ DEFINE_HANDLER(CMSG_FAR_SIGHT, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleFarSightOpcode );
/*0x27B*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPELLDISPELLOG, STATUS_NEVER);
/*0x27C*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_DAMAGE_CALC_LOG, STATUS_NEVER);
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
index e6a857eb9f0..9f645d6c02f 100644
--- a/src/server/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
@@ -145,6 +145,7 @@ namespace WorldPackets
namespace Pet
{
class DismissCritter;
+ class RequestPetInfo;
}
namespace Query
@@ -994,7 +995,7 @@ class TC_GAME_API WorldSession
void HandleAreaSpiritHealerQueueOpcode(WorldPacket& recvData);
void HandleSelfResOpcode(WorldPacket& recvData);
void HandleComplainOpcode(WorldPacket& recvData);
- void HandleRequestPetInfoOpcode(WorldPacket& recvData);
+ void HandleRequestPetInfo(WorldPackets::Pet::RequestPetInfo& packet);
// Socket gem
void HandleSocketOpcode(WorldPacket& recvData);