Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 9 additions & 3 deletions RLBotCS/Server/FlatBuffersSession.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ public readonly record struct DistributeBallPrediction(BallPredictionT BallPredi

public readonly record struct StopMatch(bool Force) : SessionMessage;

public readonly record struct UpdateRendering(RenderingStatusT Status) : SessionMessage;
public readonly record struct UpdateRenderingStatus(RenderingStatusT Status)
: SessionMessage;

public readonly record struct PingResponse(ulong Cookie) : SessionMessage;
}
Expand Down Expand Up @@ -312,7 +313,7 @@ await _bridge.WriteAsync(

case InterfaceMessage.RenderingStatus:
var renderingStatus = msg.MessageAsRenderingStatus().UnPack();
await _rlbotServer.WriteAsync(new UpdateRendering(renderingStatus));
await _rlbotServer.WriteAsync(new UpdateRenderingStatus(renderingStatus));
break;

case InterfaceMessage.UpdatePerformanceMonitor:
Expand Down Expand Up @@ -430,7 +431,7 @@ private async Task HandleInternalMessages()
when m.Force || (_connectionEstablished && _closeBetweenMatches):
_sessionForceClosed = m.Force;
return;
case SessionMessage.UpdateRendering m:
case SessionMessage.UpdateRenderingStatus m:
if (_team == Team.Other)
{
SendPayloadToClient(CoreMessageUnion.FromRenderingStatus(m.Status));
Expand All @@ -444,6 +445,11 @@ private async Task HandleInternalMessages()
{
_renderingIsEnabled = m.Status.Status;
SendPayloadToClient(CoreMessageUnion.FromRenderingStatus(m.Status));

if (!_renderingIsEnabled)
{
await _bridge.WriteAsync(new RemoveClientRenders(_clientId));
}
}

break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

namespace RLBotCS.Server.ServerMessage;

readonly struct UpdateRendering(RenderingStatusT Status) : IServerMessage
readonly struct UpdateRenderingStatus(RenderingStatusT Status) : IServerMessage
{
public ServerAction Execute(ServerContext context)
{
// Ignore all messages if rendering is force-disabled
if (context.RenderingIsEnabled == DebugRendering.AlwaysOff)
return ServerAction.Continue;

SessionMessage.UpdateRendering message = new(Status);
SessionMessage.UpdateRenderingStatus message = new(Status);

// Distribute to all sessions;
// they will figure out on their own if rendering should be enable/disabled
Expand Down
Loading