Fix initial match start

Don't flush match commands, wait!
RLBot · Aug 11, 2024 · df88b17 · df88b17
1 parent d75b805
commit df88b17
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/RLBotCS/ManagerTools/MatchStarter.cs b/RLBotCS/ManagerTools/MatchStarter.cs
@@ -24,7 +24,6 @@ int rlbotSocketsPort
     private bool _communicationStarted;
     private bool _hasEverLoadedMap;
     private bool _needsSpawnCars;
-    private bool _mapLoaded;
 
     public bool MatchEnded = false;
 
@@ -68,10 +67,6 @@ public void MapSpawned()
         if (!_needsSpawnCars)
             return;
 
-        Logger.LogInformation("Setting mapLoaded to true");
-
-        _mapLoaded = true;
-
         if (_deferredMatchSettings is MatchSettingsT matchSettings)
         {
             bridge.TryWrite(new SetMutators(matchSettings.MutatorSettings));
@@ -82,7 +77,6 @@ public void MapSpawned()
 
             _matchSettings = matchSettings;
             _deferredMatchSettings = null;
-            bridge.TryWrite(new FlushMatchCommands());
         }
     }
 
@@ -196,7 +190,6 @@ private void LoadMatch(MatchSettingsT matchSettings)
 
         if (shouldSpawnNewMap)
         {
-            _mapLoaded = false;
             _hasEverLoadedMap = true;
             _deferredMatchSettings = matchSettings;
 
@@ -404,15 +397,12 @@ public void IncrementConnectionReadies()
                 + _expectedConnections
                 + "; needs spawn cars: "
                 + _needsSpawnCars
-                + "; map loaded: "
-                + _mapLoaded
         );
 
         if (
             _deferredMatchSettings is MatchSettingsT matchSettings
             && _connectionReadies >= _expectedConnections
             && _needsSpawnCars
-            && _mapLoaded
         )
         {
             bool needsFlush = SpawnCars(matchSettings);
@@ -421,8 +411,6 @@ _deferredMatchSettings is MatchSettingsT matchSettings
 
             _matchSettings = matchSettings;
             _deferredMatchSettings = null;
-
-            bridge.TryWrite(new FlushMatchCommands());
         }
     }
 }