]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Update TriggerSystem.TimedCollide.cs to not use Component.Owner (#29970)
authorPlykiya <58439124+Plykiya@users.noreply.github.com>
Sat, 13 Jul 2024 03:12:46 +0000 (20:12 -0700)
committerGitHub <noreply@github.com>
Sat, 13 Jul 2024 03:12:46 +0000 (20:12 -0700)
Update TriggerSystem.TimedCollide.cs

Co-authored-by: plykiya <plykiya@protonmail.com>
Content.Server/Explosion/EntitySystems/TriggerSystem.TimedCollide.cs

index 29b81deb32c2ce4d462a0150c51bb780f936a178..ea10b7c69b3b3ca25794fb0105ca3017e7d50dff 100644 (file)
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Explosion.Components;
 using Content.Server.Explosion.EntitySystems;
 using Robust.Shared.Physics.Dynamics;
@@ -42,14 +42,15 @@ public sealed partial class TriggerSystem
 
     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)
             {
                 triggerOnTimedCollide.Colliding[collidingEntity] += frameTime;
                 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;
                 }
             }