Ticket #3305: t3305_clear_player_assignments_when_starting_the_game_v2.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(auto it = m_PlayerAssignments.begin(), ite = m_PlayerAssignments.end(); it != ite;)
+    {
+        if (it->second.m_Enabled)
+            ++it;
+        else
+            it = m_PlayerAssignments.erase(it);
+    }
+
     SendPlayerAssignments();
 
     CGameStartMessage gameStart;
     Broadcast(&gameStart);
 }