Skip to content

Fix C&S on LAN matches #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 9, 2025
Merged

Fix C&S on LAN matches #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44a78e4
Distinguish debug logs a bit more
VirxEC May 8, 2025
22fb905
Fix C&S for LAN matches
VirxEC May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RLBotCS/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion RLBotCS/ManagerTools/Logging.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
11 changes: 11 additions & 0 deletions RLBotCS/Server/BridgeHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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)
Expand Down