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

Update TriggerSystem.TimedCollide.cs to not use Component.Owner (#29970)

Browse Source 
Update TriggerSystem.TimedCollide.cs

Co-authored-by: plykiya <plykiya@protonmail.com>
This commit is contained in:
Plykiya
2024-07-12 20:12:46 -07:00
committed by GitHub
parent 5fa0844f3c
commit 8ed9ea1586
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Explosion/EntitySystems/TriggerSystem.TimedCollide.cs
View File

@@ -1,4 +1,4 @@
using System.Linq; using System.Linq;
using Content.Server.Explosion.Components; using Content.Server.Explosion.Components;
using Content.Server.Explosion.EntitySystems; using Content.Server.Explosion.EntitySystems;
using Robust.Shared.Physics.Dynamics; using Robust.Shared.Physics.Dynamics;
@@ -42,14 +42,15 @@ public sealed partial class TriggerSystem
private void UpdateTimedCollide(float frameTime) private void UpdateTimedCollide(float frameTime)
{ {
foreach (var (activeTrigger, triggerOnTimedCollide) in EntityQuery<ActiveTriggerOnTimedCollideComponent, TriggerOnTimedCollideComponent>()) var query = EntityQueryEnumerator<ActiveTriggerOnTimedCollideComponent, TriggerOnTimedCollideComponent>();
while (query.MoveNext(out var uid, out _, out var triggerOnTimedCollide))
{ {
foreach (var (collidingEntity, collidingTimer) in triggerOnTimedCollide.Colliding) foreach (var (collidingEntity, collidingTimer) in triggerOnTimedCollide.Colliding)
{ {
triggerOnTimedCollide.Colliding[collidingEntity] += frameTime; triggerOnTimedCollide.Colliding[collidingEntity] += frameTime;
if (collidingTimer > triggerOnTimedCollide.Threshold) if (collidingTimer > triggerOnTimedCollide.Threshold)
{ {
RaiseLocalEvent(activeTrigger.Owner, new TriggerEvent(activeTrigger.Owner, collidingEntity), true); RaiseLocalEvent(uid, new TriggerEvent(uid, collidingEntity), true);
triggerOnTimedCollide.Colliding[collidingEntity] -= triggerOnTimedCollide.Threshold; triggerOnTimedCollide.Colliding[collidingEntity] -= triggerOnTimedCollide.Threshold;
} }
} }