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

prevent repeat TriggerOnCollide triggers (#40428)

Browse Source 
* prevent repeat TriggerOnCollide triggers

* review comment: remove TriggerOnCollide when out of triggers
This commit is contained in:
Charlie Morley
2025-09-21 09:23:37 -06:00
committed by GitHub
parent 7678251ad5
commit 818a715822
6 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Shared/Trigger/Systems/TriggerSystem.Collide.cs
View File

@@ -18,8 +18,21 @@ public sealed partial class TriggerSystem
private void OnCollide(Entity<TriggerOnCollideComponent> ent, ref StartCollideEvent args)
{
if (args.OurFixtureId == ent.Comp.FixtureID && (!ent.Comp.IgnoreOtherNonHard || args.OtherFixture.Hard))
if (
args.OurFixtureId == ent.Comp.FixtureID
&& (!ent.Comp.IgnoreOtherNonHard || args.OtherFixture.Hard)
&& (ent.Comp.MaxTriggers == null || ent.Comp.MaxTriggers > 0)
)
{
if (ent.Comp.MaxTriggers != null)
{
ent.Comp.MaxTriggers--;
Dirty(ent);
if (ent.Comp.MaxTriggers <= 0)
RemCompDeferred<TriggerOnCollideComponent>(ent);
}
Trigger(ent.Owner, args.OtherEntity, ent.Comp.KeyOut);
}
}
private void OnStepTriggered(Entity<TriggerOnStepTriggerComponent> ent, ref StepTriggeredOffEvent args)