From b97f0f033e4ffa7871ba9d3b29d5afcc28eef53b Mon Sep 17 00:00:00 2001 From: Jessica M Date: Tue, 2 Aug 2022 18:30:10 -0700 Subject: [PATCH] Fixes lobby station timer (#10261) --- Content.Client/Lobby/LobbyState.cs | 2 +- Content.Server/GameTicking/GameTicker.RoundFlow.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs index fa8fc3c355..bdb4b227cf 100644 --- a/Content.Client/Lobby/LobbyState.cs +++ b/Content.Client/Lobby/LobbyState.cs @@ -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; } diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs index d832f1a417..cddf725f45 100644 --- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs +++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs @@ -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()