From 2b6844932894625e43089936b3fe09981c9eb4b5 Mon Sep 17 00:00:00 2001
From: metalgearsloth <comedian_vs_clown@hotmail.com>
Date: Mon, 27 Sep 2021 15:32:53 +1000
Subject: [PATCH] Fix pulling crash on round restart

---
 Content.Shared/Pulling/Components/SharedPullableComponent.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Content.Shared/Pulling/Components/SharedPullableComponent.cs b/Content.Shared/Pulling/Components/SharedPullableComponent.cs
index c32909e896..01dc333b4f 100644
--- a/Content.Shared/Pulling/Components/SharedPullableComponent.cs
+++ b/Content.Shared/Pulling/Components/SharedPullableComponent.cs
@@ -69,7 +69,9 @@ namespace Content.Shared.Pulling.Components
                         var message = new PullStoppedMessage(oldPullerPhysics, _physics);
 
                         eventBus.RaiseLocalEvent(oldPuller.Uid, message, broadcast: false);
-                        eventBus.RaiseLocalEvent(Owner.Uid, message);
+
+                        if (Owner.LifeStage <= EntityLifeStage.MapInitialized)
+                            eventBus.RaiseLocalEvent(Owner.Uid, message);
 
                         _physics.WakeBody();
                     }