From 55cb56da59611c459d2569b759dd77ac95e0a3d1 Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Sun, 4 Jun 2017 18:04:37 +0300 Subject: [PATCH] Server ends the round if all characters are either dead or unconscious when autorestart is on (instead of waiting for everyone to be dead) --- Barotrauma/Source/Networking/GameServer.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Barotrauma/Source/Networking/GameServer.cs b/Barotrauma/Source/Networking/GameServer.cs index 8e98daa73..936cecb39 100644 --- a/Barotrauma/Source/Networking/GameServer.cs +++ b/Barotrauma/Source/Networking/GameServer.cs @@ -402,9 +402,9 @@ namespace Barotrauma.Networking entityEventManager.Update(connectedClients); - bool isCrewDead = - connectedClients.Find(c => c.Character != null && !c.Character.IsDead)==null && - (myCharacter == null || myCharacter.IsDead); + bool isCrewDead = + connectedClients.All(c => c.Character == null || c.Character.IsDead || c.Character.IsUnconscious) && + (myCharacter == null || myCharacter.IsDead || myCharacter.IsUnconscious); //restart if all characters are dead or submarine is at the end of the level if ((autoRestart && isCrewDead)