NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 18:31:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

GameTicker upstream fix

Browse source 
StationEvents
This commit is contained in:
Dmitry 2026-09-20 03:12:58 +07:00
parent cb9bcf9528
commit 5ea431e0e0
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Content.Server/StationEvents/Events/PowerGridCheckRule.cs
View file

@ -135,6 +135,11 @@ namespace Content.Server.StationEvents.Events
// Can't use the default EndAudio
rule.Comp.AnnounceCancelToken?.Cancel();
// Corvax-Announcements-fix временная заплатка, удалить после реворка https://github.com/space-wizards/space-station-14/issues/46073
if (MetaData(rule).EntityLifeStage >= EntityLifeStage.Terminating)
return;
rule.Comp.AnnounceCancelToken = new CancellationTokenSource();
Timer.Spawn(3000,
() =>

4
Content.Server/StationEvents/Events/StationEventSystem.cs
View file

@ -78,6 +78,10 @@ public abstract partial class StationEventSystem<T> : GameRuleSystem<T> where T
AdminLogManager.Add(LogType.EventStopped, $"Event ended: {ToPrettyString(rule)}");
// Corvax-Announcements-fix временная заплатка, удалить после реворка https://github.com/space-wizards/space-station-14/issues/46073
if (MetaData(rule).EntityLifeStage >= EntityLifeStage.Terminating)
return;
// we don't want to send to players who aren't in game (i.e. in the lobby)
Filter allPlayersInGame = Filter.Empty().AddWhere(GameTicker.UserHasJoinedGame);