From c1ba2f76c7ffd95a9e391b9bd67ef1a2f7ef7b31 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Date: Fri, 3 Jul 2020 23:26:30 +0200
Subject: [PATCH] Fix crash when reentering a body (#1258)

---
 Content.Client/EntryPoint.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Content.Client/EntryPoint.cs b/Content.Client/EntryPoint.cs
index 9e8172d4cf..28c04b08a2 100644
--- a/Content.Client/EntryPoint.cs
+++ b/Content.Client/EntryPoint.cs
@@ -125,7 +125,10 @@ namespace Content.Client
         /// </summary>
         public static void DetachPlayerFromEntity(EntityDetachedEventArgs eventArgs)
         {
-            eventArgs.OldEntity.RemoveComponent<CharacterInterface>();
+            if (!eventArgs.OldEntity.Deleted)
+            {
+                eventArgs.OldEntity.RemoveComponent<CharacterInterface>();
+            }
         }
 
         public override void PostInit()