From: terencehill <piuntn@gmail.com>
Date: Mon, 18 Jun 2018 12:56:32 +0000 (+0200)
Subject: Clan Arena, warmup stage: fix bots standing still after their first death; don't... 
X-Git-Tag: xonotic-v0.8.5~2010^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e357bc4c0b6dd08c932a2822b34a5efdb61e37dd;p=xonotic%2Fxonotic-data.pk3dir.git

Clan Arena, warmup stage: fix bots standing still after their first death; don't display the "you are now alone" message since players are allowed to respawn anytime
---

diff --git a/qcsrc/common/gamemodes/gamemode/clanarena/clanarena.qc b/qcsrc/common/gamemodes/gamemode/clanarena/clanarena.qc
index 561129c7d..98f75aaa2 100644
--- a/qcsrc/common/gamemodes/gamemode/clanarena/clanarena.qc
+++ b/qcsrc/common/gamemodes/gamemode/clanarena/clanarena.qc
@@ -253,8 +253,7 @@ entity ca_LastPlayerForTeam(entity this)
 
 void ca_LastPlayerForTeam_Notify(entity this)
 {
-	if (round_handler_IsActive())
-	if (round_handler_IsRoundStarted())
+	if (!warmup_stage && round_handler_IsActive() && round_handler_IsRoundStarted())
 	{
 		entity pl = ca_LastPlayerForTeam(this);
 		if (pl)
@@ -275,9 +274,11 @@ MUTATOR_HOOKFUNCTION(ca, PlayerDies)
 	}
 	frag_target.respawn_flags |= RESPAWN_FORCE;
 	if (!warmup_stage)
+	{
 		eliminatedPlayers.SendFlags |= 1;
-	if(IS_BOT_CLIENT(frag_target))
-		bot_clear(frag_target);
+		if (IS_BOT_CLIENT(frag_target))
+			bot_clear(frag_target);
+	}
 	return true;
 }