(b21318728) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-29 21:09:50 +03:00
parent 97c4e3019d
commit 67a0636470
14 changed files with 112 additions and 65 deletions
@@ -2551,32 +2551,14 @@ namespace Barotrauma

            if (info != null) { info.Remove(); }

-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
 #if CLIENT
            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
 #endif

            CharacterList.Remove(this);

+            if (Controlled == this) { Controlled = null; }
+
            if (Inventory != null)
            {
                foreach (Item item in Inventory.Items)