(bf212a41f) v0.9.2.0 pre-release test version

2019-07-27 21:06:07 +03:00
parent afa2137bd2
commit 0f63da27b2
154 changed files with 3959 additions and 1428 deletions
@@ -81,10 +81,8 @@ namespace Barotrauma

            bool success =
                GameMain.Server.ConnectedClients.Any(c => c.InGame && c.Character != null && !c.Character.IsDead);
-
-#if CLIENT
+            
            success = success || (GameMain.Server.Character != null && !GameMain.Server.Character.IsDead);
-#endif

            /*if (success)
            {
@@ -119,11 +117,7 @@ namespace Barotrauma
            {
                c.Inventory?.DeleteAllItems();
            }
-
-#if CLIENT
-            GameMain.GameSession.CrewManager.EndRound();
-#endif
-
+            
            if (success)
            {
                bool atEndPosition = Submarine.MainSub.AtEndPosition;