Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix a late joining client not knowing if the lobby has been paused (#1199)

Browse Source 
* Fix client not knowing that the lobby is paused when joining after the pause

Also fixes a client thinking that a lobby is paused when joining a new one after leaving a previously paused one

* Add server announcement to delaying and pausing round start
This commit is contained in:
DrSmugleaf
2020-06-23 21:30:37 +02:00
committed by GitHub
parent 7089b60738
commit 78085855db
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Client/GameTicking/ClientGameTicker.cs
View File

@@ -55,6 +55,7 @@ namespace Content.Client.GameTicking
StartTime = message.StartTime; StartTime = message.StartTime;
IsGameStarted = message.IsRoundStarted; IsGameStarted = message.IsRoundStarted;
AreWeReady = message.YouAreReady; AreWeReady = message.YouAreReady;
Paused = message.Paused;
LobbyStatusUpdated?.Invoke(); LobbyStatusUpdated?.Invoke();
} }

7
Content.Server/GameTicking/GameTicker.cs
View File

@@ -437,6 +437,8 @@ namespace Content.Server.GameTicking
lobbyCountdownMessage.Paused = Paused; lobbyCountdownMessage.Paused = Paused;
_netManager.ServerSendToAll(lobbyCountdownMessage); _netManager.ServerSendToAll(lobbyCountdownMessage);
_chatManager.DispatchServerAnnouncement($"Round start has been delayed for {time.TotalSeconds} seconds.");
return true; return true;
} }
@@ -463,6 +465,10 @@ namespace Content.Server.GameTicking
lobbyCountdownMessage.Paused = Paused; lobbyCountdownMessage.Paused = Paused;
_netManager.ServerSendToAll(lobbyCountdownMessage); _netManager.ServerSendToAll(lobbyCountdownMessage);
_chatManager.DispatchServerAnnouncement(Paused
? "Round start has been paused."
: "Round start countdown is now resumed.");
return true; return true;
} }
@@ -838,6 +844,7 @@ namespace Content.Server.GameTicking
msg.IsRoundStarted = RunLevel != GameRunLevel.PreRoundLobby; msg.IsRoundStarted = RunLevel != GameRunLevel.PreRoundLobby;
msg.StartTime = _roundStartTimeUtc; msg.StartTime = _roundStartTimeUtc;
msg.YouAreReady = ready; msg.YouAreReady = ready;
msg.Paused = Paused;
return msg; return msg;
} }

3
Content.Shared/SharedGameTicker.cs
View File

@@ -66,6 +66,7 @@ namespace Content.Shared
public bool YouAreReady { get; set; } public bool YouAreReady { get; set; }
// UTC. // UTC.
public DateTime StartTime { get; set; } public DateTime StartTime { get; set; }
public bool Paused { get; set; }
public override void ReadFromBuffer(NetIncomingMessage buffer) public override void ReadFromBuffer(NetIncomingMessage buffer)
{ {
@@ -78,6 +79,7 @@ namespace Content.Shared
YouAreReady = buffer.ReadBoolean(); YouAreReady = buffer.ReadBoolean();
StartTime = new DateTime(buffer.ReadInt64(), DateTimeKind.Utc); StartTime = new DateTime(buffer.ReadInt64(), DateTimeKind.Utc);
Paused = buffer.ReadBoolean();
} }
public override void WriteToBuffer(NetOutgoingMessage buffer) public override void WriteToBuffer(NetOutgoingMessage buffer)
@@ -91,6 +93,7 @@ namespace Content.Shared
buffer.Write(YouAreReady); buffer.Write(YouAreReady);
buffer.Write(StartTime.Ticks); buffer.Write(StartTime.Ticks);
buffer.Write(Paused);
} }
} }