Ticket #3607: t3607_assign_the_unassigned_v1.patch

binaries/data/mods/public/gui/gamesetup/gamesetup.js

@@ -455 +455 @@
         var resetReady = false;
         var newPlayer = "";
         // Find and report all joinings/leavings
         for (var host in message.hosts)
         {
-            if (!g_PlayerAssignments[host])
+            if (g_PlayerAssignments[host])
+                continue;
+
+            // If we have extra player slots and we are the controller, give the player an ID.
+            if (g_IsController && message.hosts[host].player === -1 && g_AssignedCount < g_GameAttributes.settings.PlayerData.length)
             {
-                // If we have extra player slots and we are the controller, give the player an ID.
-                if (g_IsController && message.hosts[host].player === -1 && g_AssignedCount < g_GameAttributes.settings.PlayerData.length)
-                    Engine.AssignNetworkPlayer(g_AssignedCount + 1, host);
-                addChatMessage({ "type": "connect", "username": message.hosts[host].name });
-                newPlayer = host;
+                // Find an index of the playerdata array which is not assigned to any player
+                let freeSlot = 1 + g_GameAttributes.settings.PlayerData.findIndex((v,i) =>
+                    Object.keys(g_PlayerAssignments).every(guid => g_PlayerAssignments[guid].player != i + 1)
+                );
+                Engine.AssignNetworkPlayer(freeSlot, host);
             }
+
+            addChatMessage({ "type": "connect", "username": message.hosts[host].name });
+            newPlayer = host;
         }
 
         for (var host in g_PlayerAssignments)
         {
             if (!message.hosts[host])