Skip to content

Commit 18a08f1

Browse files
Clean client rendering on RenderStatus change
1 parent c9fbb76 commit 18a08f1

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

RLBotCS/Server/FlatBuffersSession.cs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public readonly record struct DistributeBallPrediction(BallPredictionT BallPredi
3535

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

38-
public readonly record struct UpdateRendering(RenderingStatusT Status) : SessionMessage;
38+
public readonly record struct UpdateRenderingStatus(RenderingStatusT Status) : SessionMessage;
3939

4040
public readonly record struct PingResponse(ulong Cookie) : SessionMessage;
4141
}
@@ -312,7 +312,7 @@ await _bridge.WriteAsync(
312312

313313
case InterfaceMessage.RenderingStatus:
314314
var renderingStatus = msg.MessageAsRenderingStatus().UnPack();
315-
await _rlbotServer.WriteAsync(new UpdateRendering(renderingStatus));
315+
await _rlbotServer.WriteAsync(new UpdateRenderingStatus(renderingStatus));
316316
break;
317317

318318
case InterfaceMessage.UpdatePerformanceMonitor:
@@ -430,7 +430,7 @@ private async Task HandleInternalMessages()
430430
when m.Force || (_connectionEstablished && _closeBetweenMatches):
431431
_sessionForceClosed = m.Force;
432432
return;
433-
case SessionMessage.UpdateRendering m:
433+
case SessionMessage.UpdateRenderingStatus m:
434434
if (_team == Team.Other)
435435
{
436436
SendPayloadToClient(CoreMessageUnion.FromRenderingStatus(m.Status));
@@ -444,6 +444,11 @@ private async Task HandleInternalMessages()
444444
{
445445
_renderingIsEnabled = m.Status.Status;
446446
SendPayloadToClient(CoreMessageUnion.FromRenderingStatus(m.Status));
447+
448+
if (!_renderingIsEnabled)
449+
{
450+
await _bridge.WriteAsync(new RemoveClientRenders(_clientId));
451+
}
447452
}
448453

449454
break;

RLBotCS/Server/ServerMessage/UpdateRendering.cs renamed to RLBotCS/Server/ServerMessage/UpdateRenderingStatus.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace RLBotCS.Server.ServerMessage;
44

5-
readonly struct UpdateRendering(RenderingStatusT Status) : IServerMessage
5+
readonly struct UpdateRenderingStatus(RenderingStatusT Status) : IServerMessage
66
{
77
public ServerAction Execute(ServerContext context)
88
{
99
// Ignore all messages if rendering is force-disabled
1010
if (context.RenderingIsEnabled == DebugRendering.AlwaysOff)
1111
return ServerAction.Continue;
1212

13-
SessionMessage.UpdateRendering message = new(Status);
13+
SessionMessage.UpdateRenderingStatus message = new(Status);
1414

1515
// Distribute to all sessions;
1616
// they will figure out on their own if rendering should be enable/disabled

0 commit comments

Comments
 (0)