Fix starting a match on the current map first thing

RLBot · Aug 14, 2024 · 62afb75 · 62afb75
1 parent 69705e9
commit 62afb75
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/RLBotCS/ManagerTools/MatchStarter.cs b/RLBotCS/ManagerTools/MatchStarter.cs
@@ -63,6 +63,7 @@ public void StartMatch(MatchSettingsT matchSettings)
     public void MapSpawned()
     {
         Logger.LogInformation("Got map info");
+        _hasEverLoadedMap = true;
 
         if (!_needsSpawnCars)
             return;
@@ -186,12 +187,10 @@ private void LoadMatch(MatchSettingsT matchSettings)
         };
 
         _needsSpawnCars = true;
-        _matchSettings = null;
-        _deferredMatchSettings = null;
-
         if (shouldSpawnNewMap)
         {
             _hasEverLoadedMap = true;
+            _matchSettings = null;
             _deferredMatchSettings = matchSettings;
 
             bridge.TryWrite(new SpawnMap(matchSettings));
@@ -211,6 +210,10 @@ private void LoadMatch(MatchSettingsT matchSettings)
 
                 if (toDespawn.Count > 0)
                 {
+                    Logger.LogInformation(
+                        "Despawning old players: "
+                            + string.Join(", ", toDespawn)
+                    );
                     bridge.TryWrite(new RemoveOldPlayers(toDespawn));
                 }
             }
@@ -220,6 +223,7 @@ private void LoadMatch(MatchSettingsT matchSettings)
             bridge.TryWrite(new FlushMatchCommands());
 
             _matchSettings = matchSettings;
+            _deferredMatchSettings = null;
         }
     }