From 43b27e93bc081edd4a894855161059560ed3d796 Mon Sep 17 00:00:00 2001 From: scuffedjays Date: Thu, 16 Apr 2020 13:07:58 -0500 Subject: [PATCH] Fix the duration timing again. --- Content.Server/GameTicking/GameTicker.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs index 29662977bf..5d58779946 100644 --- a/Content.Server/GameTicking/GameTicker.cs +++ b/Content.Server/GameTicking/GameTicker.cs @@ -195,7 +195,7 @@ namespace Content.Server.GameTicking SpawnPlayer(player, job, false); } - _roundStartTimeSpan = new TimeSpan(DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + _roundStartTimeSpan = IoCManager.Resolve().RealTime; _sendStatusToAll(); } @@ -222,10 +222,7 @@ namespace Content.Server.GameTicking roundEndMessage.GamemodeTitle = MakeGamePreset().ModeTitle; //Get the timespan of the round. - roundEndMessage.RoundDuration = new TimeSpan(DateTime.Now.Hour, - DateTime.Now.Minute, - DateTime.Now.Second) - .Subtract(_roundStartTimeSpan); + roundEndMessage.RoundDuration = IoCManager.Resolve().RealTime.Subtract(_roundStartTimeSpan); //Generate a list of basic player info to display in the end round summary. var listOfPlayerInfo = new List(); @@ -238,7 +235,7 @@ namespace Content.Server.GameTicking { PlayerOOCName = ply.Name, PlayerICName = mindComponent.Mind.CurrentEntity.Name, - Role = mindComponent.Mind.AllRoles.First() != null ? mindComponent.Mind.AllRoles.First().Name : Loc.GetString("Unkown"), + Role = mindComponent.Mind.AllRoles.FirstOrDefault()?.Name ?? Loc.GetString("Unkown"), Antag = false }; listOfPlayerInfo.Add(playerEndRoundInfo);