Skip to content

Commit a5c9417

Browse files
DDuarteShauren
authored andcommitted
Core/Packets: CMSG_NAME_QUERY (QueryPlayerName) handler
(cherry picked from commit ec7923c)
1 parent 714e2f0 commit a5c9417

4 files changed

Lines changed: 19 additions & 9 deletions

File tree

src/server/game/Handlers/QueryHandler.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,9 @@ void WorldSession::SendNameQueryOpcode(ObjectGuid guid)
6666
SendPacket(&data);
6767
}
6868

69-
void WorldSession::HandleNameQueryOpcode(WorldPacket& recvData)
69+
void WorldSession::HandleNameQueryOpcode(WorldPackets::Query::QueryPlayerName& queryPlayerName)
7070
{
71-
ObjectGuid guid;
72-
recvData >> guid;
73-
74-
// This is disable by default to prevent lots of console spam
75-
// TC_LOG_INFO("network", "HandleNameQueryOpcode {}", guid);
76-
77-
SendNameQueryOpcode(guid);
71+
SendNameQueryOpcode(queryPlayerName.Player);
7872
}
7973

8074
void WorldSession::HandleQueryTimeOpcode(WorldPacket & /*recvData*/)

src/server/game/Server/Packets/QueryPackets.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ WorldPacket const* WorldPackets::Query::QueryCreatureResponse::Write()
4949
return &_worldPacket;
5050
}
5151

52+
void WorldPackets::Query::QueryPlayerName::Read()
53+
{
54+
_worldPacket >> Player;
55+
}
56+
5257
void WorldPackets::Query::QueryGameObject::Read()
5358
{
5459
_worldPacket >> GameObjectID;

src/server/game/Server/Packets/QueryPackets.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,16 @@ namespace WorldPackets
7272
uint32 CreatureID = 0;
7373
};
7474

75+
class QueryPlayerName final : public ClientPacket
76+
{
77+
public:
78+
explicit QueryPlayerName(WorldPacket&& packet) : ClientPacket(CMSG_NAME_QUERY, std::move(packet)) { }
79+
80+
void Read() override;
81+
82+
ObjectGuid Player;
83+
};
84+
7585
class QueryGameObject final : public ClientPacket
7686
{
7787
public:

src/server/game/Server/WorldSession.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ namespace WorldPackets
239239
namespace Query
240240
{
241241
class QueryCreature;
242+
class QueryPlayerName;
242243
class QueryGameObject;
243244
class QueryCorpseLocationFromClient;
244245
class QueryCorpseTransport;
@@ -802,7 +803,7 @@ class TC_GAME_API WorldSession
802803
void HandleGameObjectUseOpcode(WorldPacket& recPacket);
803804
void HandleGameobjectReportUse(WorldPacket& recvPacket);
804805

805-
void HandleNameQueryOpcode(WorldPacket& recvPacket);
806+
void HandleNameQueryOpcode(WorldPackets::Query::QueryPlayerName& queryPlayerName);
806807

807808
void HandleQueryTimeOpcode(WorldPacket& recvPacket);
808809

0 commit comments

Comments
 (0)