Merge pull request #132 from RLBot/spawning

Wait 3 ticks (vs 1) to flush queued spawn cmds

Author: ddthj

RLBotCS/Main.cs

@@ -10,7 +10,7 @@
 if (args.Length > 0 && args[0] == "--version")
 {
     Console.WriteLine(
-        "RLBotServer v5.beta.7.6\n"
+        "RLBotServer v5.beta.7.7\n"
             + $"Bridge {BridgeVersion.Version}\n"
             + "@ https://www.rlbot.org & https://github.com/RLBot/core"
     );

RLBotCS/Server/BridgeContext.cs

@@ -20,6 +20,7 @@ MatchStarter matchStarter
     public readonly ILogger Logger = Logging.GetLogger("BridgeHandler");
 
     public int ticksSkipped = 0;
+    public uint ticksSinceMapLoad = 0;
     public GameState GameState = new();
     public MatchStarter MatchStarter { get; } = matchStarter;
     public MatchConfigurationT? MatchConfig => MatchStarter.GetMatchConfig();

RLBotCS/Server/BridgeHandler.cs

@@ -88,7 +88,10 @@ private async Task HandleServer()
                 float deltaTime = _context.GameState.SecondsElapsed - prevTime;
                 bool timeAdvanced = deltaTime > 0.001;
                 if (timeAdvanced)
+                {
                     _context.ticksSkipped = 0;
+                    _context.ticksSinceMapLoad += 1;
+                }
                 else
                     _context.ticksSkipped++;
 
@@ -105,6 +108,7 @@ private async Task HandleServer()
                 var mapJustLoaded = MessageHandler.ReceivedMatchInfo(messageClump);
                 if (mapJustLoaded)
                 {
+                    _context.ticksSinceMapLoad = 0;
                     if (_context.GameState.MatchPhase != MatchPhase.Paused)
                     {
                         // LAN matches don't set the MatchPhase to paused, which breaks Continue & Spawn
@@ -161,6 +165,7 @@ private async Task HandleServer()
 
                 if (
                     _context.MatchStarter.HasSpawnedMap
+                    && _context.ticksSinceMapLoad >= 2
                     && _context.GameState.MatchPhase == MatchPhase.Paused
                     && _context.SpawnCommandQueue.Count > 0
                 )