Core/Packets: SMSG_NAME_QUERY_RESPONSE (PlayerNameResponse) handler

(cherry picked from commit ec60d64)

Author: DDuarte

src/server/game/Handlers/QueryHandler.cpp

@@ -35,35 +35,26 @@
 
 void WorldSession::SendNameQueryOpcode(ObjectGuid guid)
 {
-    Player* player = ObjectAccessor::FindConnectedPlayer(guid);
-    CharacterCacheEntry const* nameData = sCharacterCache->GetCharacterCacheByGuid(guid);
+    WorldPackets::Query::QueryPlayerNameResponse response;
+    response.Player = guid;
 
-    WorldPacket data(SMSG_NAME_QUERY_RESPONSE, (8+1+1+1+1+1+10));
-    data << guid.WriteAsPacked();
-    if (!nameData)
+    if (CharacterCacheEntry const* characterInfo = sCharacterCache->GetCharacterCacheByGuid(guid))
     {
-        data << uint8(1);                           // name unknown
-        SendPacket(&data);
-        return;
-    }
+        response.Result = RESPONSE_SUCCESS; // name known
 
-    data << uint8(0);                               // name known
-    data << nameData->Name;                         // played name
-    data << uint8(0);                               // realm name - only set for cross realm interaction (such as Battlegrounds)
-    data << uint8(nameData->Race);
-    data << uint8(nameData->Sex);
-    data << uint8(nameData->Class);
+        WorldPackets::Query::PlayerGuidLookupData& data = response.Data.emplace();
+        data.Name = characterInfo->Name;
+        data.Race = characterInfo->Race;
+        data.Sex = characterInfo->Sex;
+        data.ClassID = characterInfo->Class;
 
-    if (DeclinedName const* names = (player ? player->GetDeclinedNames() : nullptr))
-    {
-        data << uint8(1);                           // Name is declined
-        for (uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i)
-            data << names->name[i];
+        if (Player* player = ObjectAccessor::FindConnectedPlayer(guid))
+            data.DeclinedNames = player->GetDeclinedNames();
     }
     else
-        data << uint8(0);                           // Name is not declined
+        response.Result = RESPONSE_FAILURE; // name unknown
 
-    SendPacket(&data);
+    SendPacket(response.Write());
 }
 
 void WorldSession::HandleNameQueryOpcode(WorldPackets::Query::QueryPlayerName& queryPlayerName)

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

@@ -54,6 +54,33 @@ void WorldPackets::Query::QueryPlayerName::Read()
     _worldPacket >> Player;
 }
 
+ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Query::PlayerGuidLookupData const& lookupData)
+{
+    data << lookupData.Name;
+    data << lookupData.RealmName;
+    data << uint8(lookupData.Race);
+    data << uint8(lookupData.Sex);
+    data << uint8(lookupData.ClassID);
+    data << uint8(lookupData.DeclinedNames != nullptr);
+
+    if (lookupData.DeclinedNames)
+        for (uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i)
+            data << lookupData.DeclinedNames->name[i];
+
+    return data;
+}
+
+WorldPacket const* WorldPackets::Query::QueryPlayerNameResponse::Write()
+{
+    _worldPacket << Player.WriteAsPacked();
+    _worldPacket << uint8(Result);
+
+    if (Data)
+        _worldPacket << *Data;
+
+    return &_worldPacket;
+}
+
 void WorldPackets::Query::QueryGameObject::Read()
 {
     _worldPacket >> GameObjectID;

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

@@ -82,6 +82,28 @@ namespace WorldPackets
             ObjectGuid Player;
         };
 
+        struct PlayerGuidLookupData
+        {
+            std::string_view Name;
+            std::string_view RealmName;
+            uint8 Race = RACE_NONE;
+            uint8 Sex = GENDER_NONE;
+            uint8 ClassID = CLASS_NONE;
+            DeclinedName const* DeclinedNames = nullptr;
+        };
+
+        class QueryPlayerNameResponse final : public ServerPacket
+        {
+        public:
+            explicit QueryPlayerNameResponse() : ServerPacket(SMSG_NAME_QUERY_RESPONSE, 60) { }
+
+            WorldPacket const* Write() override;
+
+            ObjectGuid Player;
+            uint8 Result = 0; // 0 - full packet, != 0 - only guid
+            Optional<PlayerGuidLookupData> Data;
+        };
+
         class QueryGameObject final : public ClientPacket
         {
             public: