Ticket #3242: t3242_clear_player_assignments_when_starting_the_game.patch

source/network/NetServer.cpp

@@ -1042 +1042 @@
 
     m_State = SERVER_STATE_LOADING;
 
     // Send the final setup state to all clients
     UpdateGameAttributes(&m_GameAttributes.get());
+
+    // Remove players and observers from the assignment that are not present when the game starts
+    for (size_t i = 0; i < m_Sessions.size(); ++i)
+        for (PlayerAssignmentMap::iterator it = m_PlayerAssignments.begin(); it != m_PlayerAssignments.end(); ++it)
+            if (!it->second.m_Enabled)
+            {
+                m_PlayerAssignments.erase(it);
+                break;
+            }
+
     SendPlayerAssignments();
 
     CGameStartMessage gameStart;
     Broadcast(&gameStart);
 }