Fix field info not being distributed

Make `StopCommand` end the match
RLBot · Aug 11, 2024 · 7a23f61 · 7a23f61
1 parent 33c2f25
commit 7a23f61
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 21 deletions.
diff --git a/RLBotCS/Server/BridgeHandler.cs b/RLBotCS/Server/BridgeHandler.cs
@@ -61,21 +61,17 @@ private async Task HandleServer()
                 bool timeAdvanced = deltaTime > 0.001;
 
                 if (timeAdvanced)
-                {
                     _context.PerfMonitor.AddRLBotSample(deltaTime);
-                    _context.Writer.TryWrite(new DistributeGameState(_context.GameState));
-                }
+                _context.Writer.TryWrite(
+                    new DistributeGameState(_context.GameState, timeAdvanced)
+                );
 
                 var matchStarted = MessageHandler.ReceivedMatchInfo(messageClump);
                 if (matchStarted)
                 {
                     _context.RenderingMgmt.ClearAllRenders();
                     _context.MatchHasStarted = true;
-                    _context.Writer.TryWrite(
-                        new MapSpawned(
-                            _context.GameState.GameStateType == GameStateType.Inactive
-                        )
-                    );
+                    _context.Writer.TryWrite(new MapSpawned());
                 }
 
                 bool matchEnded = _context.GameState.GameStateType == GameStateType.Inactive;
@@ -131,6 +127,7 @@ _context is
                     _context.DelayMatchCommandSend = false;
                     _context.QueuedMatchCommands = false;
 
+                    _context.Logger.LogInformation("Sending delayed match commands");
                     _context.MatchCommandSender.Send();
                 }
 

diff --git a/RLBotCS/Server/BridgeMessage.cs b/RLBotCS/Server/BridgeMessage.cs
@@ -128,15 +128,6 @@ internal record ConsoleCommand(string Command) : IBridgeMessage
     public void HandleMessage(BridgeContext context) => context.QueueConsoleCommand(Command);
 }
 
-internal record SetPaused(bool Pause) : IBridgeMessage
-{
-    public void HandleMessage(BridgeContext context)
-    {
-        context.QueuedMatchCommands = true;
-        context.MatchCommandSender.AddSetPausedCommand(Pause);
-    }
-}
-
 internal record SpawnMap(MatchSettingsT MatchSettings) : IBridgeMessage
 {
     public void HandleMessage(BridgeContext context)
@@ -312,6 +303,15 @@ public void HandleMessage(BridgeContext context)
     }
 }
 
+internal record EndMatch() : IBridgeMessage
+{
+    public void HandleMessage(BridgeContext context)
+    {
+        context.MatchCommandSender.AddMatchEndCommand();
+        context.MatchCommandSender.Send();
+    }
+}
+
 internal record ShowQuickChat(MatchCommT MatchComm) : IBridgeMessage
 {
     public void HandleMessage(BridgeContext context) =>

diff --git a/RLBotCS/Server/FlatbuffersMessage/DistributeGameState.cs b/RLBotCS/Server/FlatbuffersMessage/DistributeGameState.cs
@@ -6,7 +6,7 @@
 
 namespace RLBotCS.Server.FlatbuffersMessage;
 
-internal record DistributeGameState(GameState GameState) : IServerMessage
+internal record DistributeGameState(GameState GameState, bool timeAdvanced) : IServerMessage
 {
     private static void UpdateFieldInfo(ServerContext context, GameState gameState)
     {
@@ -107,8 +107,12 @@ private static void DistributeState(ServerContext context, GameState gameState)
     public ServerAction Execute(ServerContext context)
     {
         UpdateFieldInfo(context, GameState);
-        DistributeBallPrediction(context, GameState);
-        DistributeState(context, GameState);
+
+        if (timeAdvanced)
+        {
+            DistributeBallPrediction(context, GameState);
+            DistributeState(context, GameState);
+        }
 
         return ServerAction.Continue;
     }

diff --git a/RLBotCS/Server/FlatbuffersMessage/MapSpawned.cs b/RLBotCS/Server/FlatbuffersMessage/MapSpawned.cs
@@ -1,6 +1,6 @@
 namespace RLBotCS.Server.FlatbuffersMessage;
 
-internal record MapSpawned(bool NotifyMatchStarter) : IServerMessage
+internal record MapSpawned() : IServerMessage
 {
     public ServerAction Execute(ServerContext context)
     {

diff --git a/RLBotCS/Server/FlatbuffersMessage/StopMatch.cs b/RLBotCS/Server/FlatbuffersMessage/StopMatch.cs
@@ -14,6 +14,7 @@ public ServerAction Execute(ServerContext context)
             return ServerAction.Stop;
         }
 
+        context.Bridge.TryWrite(new EndMatch());
         foreach (var (writer, _) in context.Sessions.Values)
             writer.TryWrite(new SessionMessage.StopMatch(ShutdownServer));
         return ServerAction.Continue;