From: Lyberta <lyberta@lyberta.net>
Date: Thu, 23 Mar 2017 07:43:58 +0000 (+0300)
Subject: Better condition for messages.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=27d17a03d1313a599513ff7b3c6a01a0d14710c7;p=xonotic%2Fxonotic-data.pk3dir.git

Better condition for messages.
---

diff --git a/qcsrc/server/mutators/mutator/gamemode_survival.qc b/qcsrc/server/mutators/mutator/gamemode_survival.qc
index 254c3e1c9..0d626a55f 100644
--- a/qcsrc/server/mutators/mutator/gamemode_survival.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_survival.qc
@@ -589,7 +589,7 @@ void Surv_RemovePlayerFromAliveList(entity player, int t)
 				ftos(surv_numdefendersalive));
 			LOG_TRACE(message);
 			DebugPrintToChatAll(message);
-			if (warmup_stage)
+			if (warmup_stage || surv_allowed_to_spawn)
 			{
 				break;
 			}
@@ -657,7 +657,8 @@ void Surv_CountAlivePlayers()
 		eliminatedPlayers.SendFlags |= 1;
 	}
 	Surv_UpdateAliveStats();
-	if (warmup_stage || (savednumdefenders <= surv_numdefendersalive))
+	if (warmup_stage || surv_allowed_to_spawn || (savednumdefenders <=
+		surv_numdefendersalive))
 	{
 		return;
 	}