Move processNameResponse2 into ea namespace.

2 files changed, 48 insertions, 0 deletions

diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index da6ace767..5f835047d 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -446,4 +446,50 @@ void BeingHandler::processPvpSet(Net::MessageIn &msg)
     BLOCK_END("BeingHandler::processPvpSet")
 }
 
+void BeingHandler::processNameResponse2(Net::MessageIn &msg)
+{
+    BLOCK_START("BeingHandler::processNameResponse2")
+    if (!actorManager || !localPlayer)
+    {
+        BLOCK_END("BeingHandler::processNameResponse2")
+        return;
+    }
+
+    const int len = msg.readInt16("len");
+    const int beingId = msg.readInt32("account ic");
+    const std::string str = msg.readString(len - 8, "name");
+    Being *const dstBeing = actorManager->findBeing(beingId);
+    if (dstBeing)
+    {
+        if (beingId == localPlayer->getId())
+        {
+            localPlayer->pingResponse();
+        }
+        else
+        {
+            dstBeing->setName(str);
+            dstBeing->updateGuild();
+            dstBeing->addToCache();
+
+            if (dstBeing->getType() == ActorType::Player)
+                dstBeing->updateColors();
+
+            if (localPlayer)
+            {
+                const Party *const party = localPlayer->getParty();
+                if (party && party->isMember(dstBeing->getId()))
+                {
+                    PartyMember *const member = party->getMember(
+                        dstBeing->getId());
+
+                    if (member)
+                        member->setName(dstBeing->getName());
+                }
+                localPlayer->checkNewName(dstBeing);
+            }
+        }
+    }
+    BLOCK_END("BeingHandler::processNameResponse2")
+}
+
 }  // namespace Ea
diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h
index 8513df916..9ac9fc39d 100644
--- a/src/net/ea/beinghandler.h
+++ b/src/net/ea/beinghandler.h
@@ -68,6 +68,8 @@ class BeingHandler notfinal : public Net::BeingHandler
 
         static void processPvpSet(Net::MessageIn &msg);
 
+        static void processNameResponse2(Net::MessageIn &msg);
+
         // Should we honor server "Stop Walking" packets
         static int mSpawnId;
         static bool mSync;