rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats 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)
{
_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;
}

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

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