Merge pull request #111 from RLBot/lan

Fix C&S on LAN matches

Author: VirxEC

RLBotCS/Main.cs

@@ -8,7 +8,7 @@
 
 if (args.Length > 0 && args[0] == "--version")
 {
-    Console.WriteLine("RLBotServer v5.beta.6.6");
+    Console.WriteLine("RLBotServer v5.beta.6.7");
     Environment.Exit(0);
 }
 

RLBotCS/ManagerTools/Logging.cs

@@ -75,7 +75,7 @@ private string[] GetLogLevelColors(LogLevel logLevel) =>
         logLevel switch
         {
             LogLevel.Trace => new[] { Grey, Grey, Grey, Grey },
-            LogLevel.Debug => new[] { Grey, LightBlue, Grey, LightBlue },
+            LogLevel.Debug => new[] { Grey, Grey, Grey, LightBlue },
             LogLevel.Information => new[] { Grey, LightBlue, Grey, LightBlue },
             LogLevel.Warning => new[] { Yellow, Yellow, Yellow, Yellow },
             LogLevel.Error => new[] { Red, Red, Red, Red },

RLBotCS/Server/BridgeHandler.cs

@@ -85,6 +85,13 @@ private async Task HandleServer()
                 var mapJustLoaded = MessageHandler.ReceivedMatchInfo(messageClump);
                 if (mapJustLoaded)
                 {
+                    if (_context.GameState.MatchPhase != MatchPhase.Paused)
+                    {
+                        // LAN matches don't set the MatchPhase to paused, which breaks Continue & Spawn
+                        // thankfully, we can just manually set the match phase to paused
+                        _context.GameState.MatchPhase = MatchPhase.Paused;
+                    }
+
                     if (_context.MatchConfig is { AutoSaveReplay: true })
                     {
                         _context.MatchCommandQueue.AddConsoleCommand(
@@ -97,6 +104,10 @@ private async Task HandleServer()
                         _context.GetPlayerSpawner()
                     );
                     _context.Writer.TryWrite(new DistributeFieldInfo(_context.GameState));
+
+                    // wait for the next tick,
+                    // this ensures we don't start the match too soon
+                    continue;
                 }
 
                 if (_context.GameState.MatchEnded)