From bbbe8d2cb1ac0bf723c68851c6ed9d0fc0ca3f87 Mon Sep 17 00:00:00 2001
From: Tyler Young <tyler.young@impromptu.ninja>
Date: Tue, 9 Jun 2020 06:29:06 -0400
Subject: [PATCH] Fix throw controller not handling deleted thrown stuff
 (#1097)

---
 Content.Shared/Physics/ThrowController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/Physics/ThrowController.cs b/Content.Shared/Physics/ThrowController.cs
index 69f237c7ad..5b71fe3394 100644
--- a/Content.Shared/Physics/ThrowController.cs
+++ b/Content.Shared/Physics/ThrowController.cs
@@ -33,7 +33,7 @@ namespace Content.Shared.Physics
 
         public void StopThrow()
         {
-            if (_component == null) return;
+            if (_component == null || _component.Owner.Deleted) return;
             if (IoCManager.Resolve<IPhysicsManager>().IsWeightless(_component.Owner.Transform.GridPosition))
             {
                 Timer.Spawn((int) (ThrowTime * 1000), StopThrow);