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/EntitySystems/SharedPullingSystem.cs
+++ b/Content.Shared/GameObjects/EntitySystems/SharedPullingSystem.cs
@@ -41,6 +41,12 @@ namespace Content.Shared.GameObjects.EntitySystems

        private void OnPullStarted(PullStartedMessage message)
        {
+            if (_pullers.TryGetValue(message.Puller.Owner, out var pulled) &&
+                pulled.TryGetComponent(out SharedPullableComponent? pulledComponent))
+            {
+                pulledComponent.TryStopPull();
+            }
+
            SetPuller(message.Puller.Owner, message.Pulled.Owner);
        }