Fix being able to pull multiple entities at once (#2398)

2020-10-26 18:15:19 +01:00
parent 847ff6dd34
commit 7dcaa1ff88
2 changed files with 17 additions and 3 deletions
--- a/Content.Shared/GameObjects/Components/Pulling/SharedPullableComponent.cs
+++ b/Content.Shared/GameObjects/Components/Pulling/SharedPullableComponent.cs
@@ -118,12 +118,20 @@ namespace Content.Shared.GameObjects.Components.Pulling

        public bool TogglePull(IEntity puller)
        {
-            if (Puller == null)
+            if (BeingPulled)
            {
-                return TryStartPull(puller);
+                if (Puller == puller)
+                {
+                    return TryStopPull();
+                }
+                else
+                {
+                    TryStopPull();
+                    return TryStartPull(puller);
+                }
            }

-            return TryStopPull();
+            return TryStartPull(puller);
        }

        public bool TryMoveTo(EntityCoordinates to)