1 files changed, 18 insertions, 1 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index f9fdf3c38..fe42daedc 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -33,10 +33,14 @@
 
 #include "particle/particle.h"
 
+#include "gui/viewport.h"
+
 #include "gui/windows/botcheckerwindow.h"
 #include "gui/windows/socialwindow.h"
 #include "gui/windows/killstats.h"
 
+#include "resources/mapitemtype.h"
+
 #include "resources/map/map.h"
 
 #include "debug.h"
@@ -331,7 +335,20 @@ void BeingHandler::processNameResponse(Net::MessageIn &msg) const
         }
         else
         {
-            dstBeing->setName(msg.readString(24, "name"));
+            const std::string name = msg.readString(24, "name");
+            if (dstBeing->getType() != ActorType::Portal)
+            {
+                dstBeing->setName(name);
+            }
+            else if (viewport)
+            {
+                Map *const map = viewport->getMap();
+                if (map)
+                {
+                    map->addPortalTile(name, MapItemType::PORTAL,
+                        dstBeing->getTileX(), dstBeing->getTileY());
+                }
+            }
             dstBeing->updateGuild();
             dstBeing->addToCache();