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

Fixed calculation of round duration

Browse Source
This commit is contained in:
scuffedjays
2020-04-15 17:46:53 -05:00
parent e5847910c7
commit 7ae8f8429d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,6 +48,7 @@ namespace Content.Server.GameTicking
private const string PlayerPrototypeName = "HumanMob_Content"; private const string PlayerPrototypeName = "HumanMob_Content";
private const string ObserverPrototypeName = "MobObserver"; private const string ObserverPrototypeName = "MobObserver";
private const string MapFile = "Maps/stationstation.yml"; private const string MapFile = "Maps/stationstation.yml";
private static TimeSpan _roundStartTimeSpan;
[ViewVariables] private readonly List<GameRule> _gameRules = new List<GameRule>(); [ViewVariables] private readonly List<GameRule> _gameRules = new List<GameRule>();
[ViewVariables] private readonly List<ManifestEntry> _manifest = new List<ManifestEntry>(); [ViewVariables] private readonly List<ManifestEntry> _manifest = new List<ManifestEntry>();
@@ -194,6 +195,7 @@ namespace Content.Server.GameTicking
SpawnPlayer(player, job, false); SpawnPlayer(player, job, false);
} }
_roundStartTimeSpan = new TimeSpan(DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second);
_sendStatusToAll(); _sendStatusToAll();
} }
@@ -220,14 +222,15 @@ namespace Content.Server.GameTicking
roundEndMessage.GamemodeTitle = MakeGamePreset().ModeTitle; roundEndMessage.GamemodeTitle = MakeGamePreset().ModeTitle;
//Get the timespan of the round. //Get the timespan of the round.
var gameTime = IoCManager.Resolve<IGameTiming>(); roundEndMessage.RoundDuration = new TimeSpan(DateTime.Now.Hour,
roundEndMessage.RoundDuration = gameTime.RealTime; DateTime.Now.Minute,
DateTime.Now.Second)
.Subtract(_roundStartTimeSpan);
//Generate a list of basic player info to display in the end round summary. //Generate a list of basic player info to display in the end round summary.
var listOfPlayerInfo = new List<RoundEndPlayerInfo>(); var listOfPlayerInfo = new List<RoundEndPlayerInfo>();
foreach(var ply in _playerManager.GetAllPlayers().OrderBy(p => p.Name)) foreach(var ply in _playerManager.GetAllPlayers().OrderBy(p => p.Name))
{ {
if (ply == null) continue;
if(ply.AttachedEntity.TryGetComponent<MindComponent>(out var mindComponent) if(ply.AttachedEntity.TryGetComponent<MindComponent>(out var mindComponent)
&& mindComponent.HasMind) && mindComponent.HasMind)
{ {
@@ -235,7 +238,7 @@ namespace Content.Server.GameTicking
{ {
PlayerOOCName = ply.Name, PlayerOOCName = ply.Name,
PlayerICName = mindComponent.Mind.CurrentEntity.Name, PlayerICName = mindComponent.Mind.CurrentEntity.Name,
Role = mindComponent.Mind.AllRoles.First().Name, Role = mindComponent.Mind.AllRoles.First() != null ? mindComponent.Mind.AllRoles.First().Name : Loc.GetString("Unkown"),
Antag = false Antag = false
}; };
listOfPlayerInfo.Add(playerEndRoundInfo); listOfPlayerInfo.Add(playerEndRoundInfo);