From ac753f14ced1a9e87c4a04cc5cd2e6a042990d7f Mon Sep 17 00:00:00 2001 From: godisdeadLOL <169250097+godisdeadLOL@users.noreply.github.com> Date: Wed, 4 Sep 2024 19:44:10 +0300 Subject: [PATCH] Teleporting while pulling crash fix (#31787) teleporting while pulling crash fix Co-authored-by: YourUsername --- Content.Shared/Teleportation/Systems/SharedPortalSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs b/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs index 8d67aec518a683..091bd8808af59f 100644 --- a/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs +++ b/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs @@ -101,7 +101,7 @@ private void OnCollide(EntityUid uid, PortalComponent component, ref StartCollid if (TryComp(subject, out var pullerComp) && TryComp(pullerComp.Pulling, out var subjectPulling)) { - _pulling.TryStopPull(subject, subjectPulling); + _pulling.TryStopPull(pullerComp.Pulling.Value, subjectPulling); } // if they came from another portal, just return and wait for them to exit the portal