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

Expose round duration as a method on GameTicker

Browse Source
This commit is contained in:
DrSmugleaf
2021-11-22 21:12:47 +01:00
parent 3ba58e2d9c
commit 7de23c935b
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Immutable;
using System.Linq; using System.Linq;
using Content.Server.Database; using Content.Server.Database;
using Content.Server.GameTicking.Events; using Content.Server.GameTicking.Events;
@@ -20,7 +19,6 @@ using Robust.Shared.Log;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Player; using Robust.Shared.Player;
using Robust.Shared.Random; using Robust.Shared.Random;
using Robust.Shared.Timing;
using Robust.Shared.Utility; using Robust.Shared.Utility;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;
@@ -199,7 +197,7 @@ namespace Content.Server.GameTicking
} }
Preset.OnGameStarted(); Preset.OnGameStarted();
_roundStartTimeSpan = IoCManager.Resolve<IGameTiming>().RealTime; _roundStartTimeSpan = _gameTiming.RealTime;
SendStatusToAll(); SendStatusToAll();
ReqWindowAttentionAll(); ReqWindowAttentionAll();
UpdateLateJoinStatus(); UpdateLateJoinStatus();
@@ -222,12 +220,12 @@ namespace Content.Server.GameTicking
var roundEndText = text + $"\n{Preset?.GetRoundEndDescription() ?? string.Empty}"; var roundEndText = text + $"\n{Preset?.GetRoundEndDescription() ?? string.Empty}";
//Get the timespan of the round. //Get the timespan of the round.
var roundDuration = IoCManager.Resolve<IGameTiming>().RealTime.Subtract(_roundStartTimeSpan); var roundDuration = RoundDuration();
//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<RoundEndMessageEvent.RoundEndPlayerInfo>(); var listOfPlayerInfo = new List<RoundEndMessageEvent.RoundEndPlayerInfo>();
// Grab the great big book of all the Minds, we'll need them for this. // Grab the great big book of all the Minds, we'll need them for this.
var allMinds = EntitySystem.Get<MindTrackerSystem>().AllMinds; var allMinds = Get<MindTrackerSystem>().AllMinds;
foreach (var mind in allMinds) foreach (var mind in allMinds)
{ {
if (mind != null) if (mind != null)
@@ -321,7 +319,7 @@ namespace Content.Server.GameTicking
private void ResettingCleanup() private void ResettingCleanup()
{ {
// Move everybody currently in the server to lobby. // Move everybody currently in the server to lobby.
foreach (var player in _playerManager.GetAllPlayers()) foreach (var player in _playerManager.ServerSessions)
{ {
PlayerJoinLobby(player); PlayerJoinLobby(player);
} }
@@ -396,6 +394,11 @@ namespace Content.Server.GameTicking
StartRound(); StartRound();
} }
public TimeSpan RoundDuration()
{
return _gameTiming.RealTime.Subtract(_roundStartTimeSpan);
}
} }
public enum GameRunLevel public enum GameRunLevel