1 files changed, 9 insertions, 1 deletions
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index e500f667b..4bf9df8b3 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -160,7 +160,15 @@ void CharServerHandler::handleMessage(Net::MessageIn &msg)
             PlayerInfo::setCharId(msg.readInt32());
             GameHandler *gh = static_cast<GameHandler*>(Net::getGameHandler());
             gh->setMap(msg.readString(16));
-            mapServer.hostname = ipToString(msg.readInt32());
+            if (config.getBoolValue("usePersistentIP"))
+            {
+                msg.readInt32();
+                mapServer.hostname = Client::getServerName();
+            }
+            else
+            {
+                mapServer.hostname = ipToString(msg.readInt32());
+            }
             mapServer.port = msg.readInt16();
 
             // Prevent the selected local player from being deleted