Ticket #3604: t3604_stop_rejoin_confusion_v2.patch

source/network/NetServer.cpp

@@ -844 +844 @@
         session->Disconnect(NDR_SERVER_LOADING);
         return true;
     }
 
     CAuthenticateMessage* message = (CAuthenticateMessage*)event->GetParamRef();
-    CStrW username = server.DeduplicatePlayerName(SanitisePlayerName(message->m_Name));
+    CStrW username = SanitisePlayerName(message->m_Name);
+
+    // Prohibit late-observer joins if a player with the same name exists
+    if (std::find_if(
+            server.m_Sessions.begin(), server.m_Sessions.end(),
+            [&username] (const CNetServerSession* session)
+            { return session->GetUserName() == username; })
+        != server.m_Sessions.end())
+    {
+        session->Disconnect(NDR_UNKNOWN);
+        return true;
+    }
 
     // Disconnect banned usernames
     if (std::find(server.m_BannedPlayers.begin(), server.m_BannedPlayers.end(), username) != server.m_BannedPlayers.end())
     {
         session->Disconnect(NDR_BANNED);
@@ -1174 +1185 @@
         name = L"Anonymous";
 
     return name;
 }
 
-CStrW CNetServerWorker::DeduplicatePlayerName(const CStrW& original)
-{
-    CStrW name = original;
-
-    // Try names "Foo", "Foo (2)", "Foo (3)", etc
-    size_t id = 2;
-    while (true)
-    {
-        bool unique = true;
-        for (size_t i = 0; i < m_Sessions.size(); ++i)
-        {
-            if (m_Sessions[i]->GetUserName() == name)
-            {
-                unique = false;
-                break;
-            }
-        }
-
-        if (unique)
-            return name;
-
-        name = original + L" (" + CStrW::FromUInt(id++) + L")";
-    }
-}
-
 
 
 
 CNetServer::CNetServer(int autostartPlayers) :
     m_Worker(new CNetServerWorker(autostartPlayers))

source/network/NetServer.h

@@ -236 +236 @@
      * Make a player name 'nicer' by limiting the length and removing forbidden characters etc.
      */
     static CStrW SanitisePlayerName(const CStrW& original);
 
     /**
-     * Make a player name unique, if it matches any existing session's name.
-     */
-    CStrW DeduplicatePlayerName(const CStrW& original);
-
-    /**
      * Get the script context used for game attributes.
      */
     ScriptInterface& GetScriptInterface();
 
     /**