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

Gamerules with occursDuringRoundEnd=false don't run only when roundend is certain (#42199)

Browse source 
gamerule cannot run if we can recall
This commit is contained in:
murphyneko 2026-07-15 15:56:21 +02:00 • committed by GitHub
parent 42a9292e9c
commit 4b960f4bfb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Content.Server/StationEvents/Components/StationEventComponent.cs
View file

@ -83,7 +83,7 @@ public sealed partial class StationEventComponent : Component
public TimeSpan? EndTime;
/// <summary>
/// If false, the event won't trigger during ongoing evacuation.
/// If false, the event won't trigger after the evacuation shuttle is called and cannot be recalled anymore.
/// </summary>
[DataField]
public bool OccursDuringRoundEnd = true;

2
Content.Server/StationEvents/EventManagerSystem.cs
View file

@ -342,7 +342,7 @@ public sealed partial class EventManagerSystem : EntitySystem
return false;
}
if (_roundEnd.IsRoundEndRequested() && !stationEvent.OccursDuringRoundEnd)
if (_roundEnd.IsRoundEndRequested() && !stationEvent.OccursDuringRoundEnd && !_roundEnd.CanCallOrRecall())
{
return false;
}