Fix crash when reentering a body (#1258)

2020-07-03 23:26:30 +02:00
parent a4ced5f1fc
commit c1ba2f76c7
1 changed files with 4 additions and 1 deletions
--- 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()