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

Comms console now restarts the round correctly.

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-09-23 11:53:31 +02:00
parent 31e0dfc10c
commit 35d817e252
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/GameObjects/EntitySystems/RoundEndSystem.cs
View File

@@ -1,9 +1,11 @@
using System; using System;
using System.Threading; using System.Threading;
using Content.Server.Interfaces.Chat;
using Content.Server.Interfaces.GameTicking; using Content.Server.Interfaces.GameTicking;
using Robust.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.Timing; using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Timer = Robust.Shared.Timers.Timer; using Timer = Robust.Shared.Timers.Timer;
namespace Content.Server.GameObjects.EntitySystems namespace Content.Server.GameObjects.EntitySystems
@@ -12,6 +14,9 @@ namespace Content.Server.GameObjects.EntitySystems
{ {
[Dependency] private readonly IGameTicker _gameTicker = default!; [Dependency] private readonly IGameTicker _gameTicker = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly IChatManager _chatManager = default!;
public const float RestartRoundTime = 20f;
private CancellationTokenSource _roundEndCancellationTokenSource = new CancellationTokenSource(); private CancellationTokenSource _roundEndCancellationTokenSource = new CancellationTokenSource();
public bool IsRoundEndCountdownStarted { get; private set; } public bool IsRoundEndCountdownStarted { get; private set; }
@@ -58,6 +63,10 @@ namespace Content.Server.GameObjects.EntitySystems
{ {
OnRoundEndCountdownFinished?.Invoke(); OnRoundEndCountdownFinished?.Invoke();
_gameTicker.EndRound(); _gameTicker.EndRound();
_chatManager.DispatchServerAnnouncement(Loc.GetString("Restarting the round in {0} seconds...", RestartRoundTime));
Timer.Spawn(TimeSpan.FromSeconds(RestartRoundTime), () => _gameTicker.RestartRound(), CancellationToken.None);
} }
} }
} }