From 39acf778587a4b9a8079441ecad179ef1083186c Mon Sep 17 00:00:00 2001 From: Moony Date: Tue, 23 Nov 2021 20:06:59 -0600 Subject: [PATCH] Speedy event patches to make events less ass (#5493) --- Content.Server/StationEvents/StationEventSystem.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Content.Server/StationEvents/StationEventSystem.cs b/Content.Server/StationEvents/StationEventSystem.cs index e6a43f6459..80622c7078 100644 --- a/Content.Server/StationEvents/StationEventSystem.cs +++ b/Content.Server/StationEvents/StationEventSystem.cs @@ -32,7 +32,7 @@ namespace Content.Server.StationEvents [Dependency] private readonly IServerNetManager _netManager = default!; [Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly IConGroupController _conGroupController = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private readonly GameTicker _gameTicker = default!; [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly AdminLogSystem _adminLog = default!; @@ -247,7 +247,8 @@ namespace Content.Server.StationEvents return; } - if (_timeUntilNextEvent > 0) + // Make sure we only count down when no event is running. + if (_timeUntilNextEvent > 0 && CurrentEvent == null) { _timeUntilNextEvent -= frameTime; return; @@ -321,7 +322,7 @@ namespace Content.Server.StationEvents // playerCount does a lock so we'll just keep the variable here if (!ignoreEarliestStart) { - currentTime = _gameTiming.CurTime; + currentTime = _gameTicker.RoundDuration(); } else {