Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Event Manager Allowing to Start Multiple Events of the Same Type in a Short Time Window #645

Merged
merged 2 commits into from
Aug 3, 2024
Merged

Fix Event Manager Allowing to Start Multiple Events of the Same Type in a Short Time Window #645

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d97f904
Start events instead of just adding
Mnemotechnician Aug 2, 2024
78c2ac2
Different fix
Mnemotechnician Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Content.Server/StationEvents/EventManagerSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ public TimeSpan TimeSinceLastEvent(EntityPrototype stationEvent)

private bool CanRun(EntityPrototype prototype, StationEventComponent stationEvent, int playerCount, TimeSpan currentTime)
{
if (GameTicker.IsGameRuleActive(prototype.ID))
if (GameTicker.IsGameRuleAdded(prototype.ID))
return false;

if (stationEvent.MaxOccurrences.HasValue && GetOccurrences(prototype) >= stationEvent.MaxOccurrences.Value)
Expand Down
Loading