From: terencehill <piuntn@gmail.com>
Date: Tue, 2 Oct 2018 18:56:45 +0000 (+0200)
Subject: Clan Arena: display the "You are now alone!" message only when needed
X-Git-Tag: xonotic-v0.8.5~1793
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=91282b6dcd296cd49aac8b2db27ba21b4ee548c0;p=xonotic%2Fxonotic-data.pk3dir.git

Clan Arena: display the "You are now alone!" message only when needed
---

diff --git a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
index 9cd378f0f..2bbed4a9a 100644
--- a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
+++ b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
@@ -298,7 +298,7 @@ MUTATOR_HOOKFUNCTION(ca, ClientDisconnect)
 {
 	entity player = M_ARGV(0, entity);
 
-	if (player.caplayer == 1)
+	if (IS_PLAYER(player) && !IS_DEAD(player))
 		ca_LastPlayerForTeam_Notify(player);
 	return true;
 }
@@ -307,7 +307,7 @@ MUTATOR_HOOKFUNCTION(ca, MakePlayerObserver)
 {
 	entity player = M_ARGV(0, entity);
 
-	if (!IS_DEAD(player))
+	if (IS_PLAYER(player) && !IS_DEAD(player))
 		ca_LastPlayerForTeam_Notify(player);
 	if (player.killindicator_teamchange == -2) // player wants to spectate
 		player.caplayer = 0;