tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes lobby station timer (#10261)

Browse Source
This commit is contained in:
Jessica M
2022-08-02 18:30:10 -07:00
committed by GitHub
parent 20b0c867c4
commit b97f0f033e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Lobby/LobbyState.cs
View File

@@ -136,7 +136,7 @@ namespace Content.Client.Lobby
if (gameTicker.IsGameStarted) if (gameTicker.IsGameStarted)
{ {
_lobby.StartTime.Text = string.Empty; _lobby.StartTime.Text = string.Empty;
_lobby.StationTime.Text = Loc.GetString("lobby-state-player-status-station-time", ("stationTime", _gameTiming.RealTime.Subtract(_gameTicker.RoundStartTimeSpan).ToString("hh\\:mm"))); _lobby.StationTime.Text = Loc.GetString("lobby-state-player-status-station-time", ("stationTime", _gameTiming.CurTime.Subtract(_gameTicker.RoundStartTimeSpan).ToString("hh\\:mm")));
return; return;
} }

4
Content.Server/GameTicking/GameTicker.RoundFlow.cs
View File

@@ -212,7 +212,7 @@ namespace Content.Server.GameTicking
_roundStartDateTime = DateTime.UtcNow; _roundStartDateTime = DateTime.UtcNow;
RunLevel = GameRunLevel.InRound; RunLevel = GameRunLevel.InRound;
_roundStartTimeSpan = _gameTiming.RealTime; _roundStartTimeSpan = _gameTiming.CurTime;
SendStatusToAll(); SendStatusToAll();
ReqWindowAttentionAll(); ReqWindowAttentionAll();
UpdateLateJoinStatus(); UpdateLateJoinStatus();
@@ -475,7 +475,7 @@ namespace Content.Server.GameTicking
public TimeSpan RoundDuration() public TimeSpan RoundDuration()
{ {
return _gameTiming.RealTime.Subtract(_roundStartTimeSpan); return _gameTiming.CurTime.Subtract(_roundStartTimeSpan);
} }
private void AnnounceRound() private void AnnounceRound()