From 400a6277fc59d08cab869d1bbcac8f964c73650d Mon Sep 17 00:00:00 2001
From: Kara D <lunarautomaton6@gmail.com>
Date: Thu, 30 Sep 2021 13:07:19 -0700
Subject: [PATCH] Fix pulling being set even if the attempt was cancelled

---
 Content.Shared/Pulling/Components/SharedPullableComponent.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Content.Shared/Pulling/Components/SharedPullableComponent.cs b/Content.Shared/Pulling/Components/SharedPullableComponent.cs
index 01dc333b4f..b8d54dc7e0 100644
--- a/Content.Shared/Pulling/Components/SharedPullableComponent.cs
+++ b/Content.Shared/Pulling/Components/SharedPullableComponent.cs
@@ -127,8 +127,6 @@ namespace Content.Shared.Pulling.Components
                         }
                     }
 
-                    valuePuller.Pulling = Owner;
-
                     // Continue with pulling process.
 
                     var pullAttempt = new PullAttemptMessage(pullerPhysics, _physics);
@@ -149,6 +147,7 @@ namespace Content.Shared.Pulling.Components
 
                     // Pull start confirm
 
+                    valuePuller.Pulling = Owner;
                     _puller = value;
                     Dirty();
                     PullerPhysics = pullerPhysics;