epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash in OrderBuffer

Browse Source
This commit is contained in:
tomas
2022-09-24 20:29:02 +02:00
committed by Gustas
parent 899298442a
commit 7b7ccf4128
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Game/Server/OrderBuffer.cs
View File

@@ -88,6 +88,9 @@ namespace OpenRA.Server
nextUpdate = now + Interval; nextUpdate = now + Interval;
if (deltas.IsEmpty)
yield break;
if (deltas.Values.Any(q => q.Count != NumberOfFrames)) if (deltas.Values.Any(q => q.Count != NumberOfFrames))
yield break; yield break;

3
OpenRA.Game/Server/Server.cs
View File

@@ -1339,7 +1339,6 @@ namespace OpenRA.Server
} }
SyncLobbyInfo(); SyncLobbyInfo();
State = ServerState.GameStarted;
var gameSpeeds = Game.ModData.Manifest.Get<GameSpeeds>(); var gameSpeeds = Game.ModData.Manifest.Get<GameSpeeds>();
var gameSpeedName = LobbyInfo.GlobalSettings.OptionOrDefault("gamespeed", gameSpeeds.DefaultSpeed); var gameSpeedName = LobbyInfo.GlobalSettings.OptionOrDefault("gamespeed", gameSpeeds.DefaultSpeed);
@@ -1349,6 +1348,8 @@ namespace OpenRA.Server
orderBuffer = new OrderBuffer(); orderBuffer = new OrderBuffer();
orderBuffer.Start(gameSpeed, Conns.Where(c => c.Validated).Select(c => c.PlayerIndex)); orderBuffer.Start(gameSpeed, Conns.Where(c => c.Validated).Select(c => c.PlayerIndex));
State = ServerState.GameStarted;
if (Type != ServerType.Local) if (Type != ServerType.Local)
OrderLatency = gameSpeed.OrderLatency; OrderLatency = gameSpeed.OrderLatency;