UseInHandEvent cleanup (#35231)

2025-02-18 13:27:30 +01:00
parent e09ef5aa6f
commit d171057680
9 changed files with 45 additions and 25 deletions
--- a/Content.Server/Teleportation/HandTeleporterSystem.cs
+++ b/Content.Server/Teleportation/HandTeleporterSystem.cs
@@ -41,6 +41,9 @@ public sealed class HandTeleporterSystem : EntitySystem

    private void OnUseInHand(EntityUid uid, HandTeleporterComponent component, UseInHandEvent args)
    {
+        if (args.Handled)
+            return;
+
        if (Deleted(component.FirstPortal))
            component.FirstPortal = null;

@@ -67,6 +70,8 @@ public sealed class HandTeleporterSystem : EntitySystem

            _doafter.TryStartDoAfter(doafterArgs);
        }
+
+        args.Handled = true;
    }