From: terencehill <piuntn@gmail.com>
Date: Thu, 24 Jan 2019 16:25:00 +0000 (+0100)
Subject: Fix "player is now spectating" message being displayed when switching from spectator... 
X-Git-Tag: xonotic-v0.8.5~1642
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=a734c393ff8fe7934fd2831f7cc9ab196686a844

Fix "player is now spectating" message being displayed when switching from spectator to observer
---

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index d9682ed6ac..c19b85fe21 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -181,7 +181,7 @@ bool Player_SetTeamIndex(entity player, int index)
 		{
 			// This is important when players join the game and one of their
 			// color matches the team color while other doesn't. For example
-			// [BOT]Lion.
+			// [BOT]Lion: color 0 4.
 			SetPlayerColors(player, new_team - 1);
 		}
 		return true;
@@ -236,7 +236,7 @@ bool SetPlayerTeam(entity player, int team_index, int type)
 	}
 	else if (team_index == -1)
 	{
-		if (!CS(player).just_joined)
+		if (!CS(player).just_joined && player.frags != FRAGS_SPECTATOR)
 			Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_QUIT_SPECTATE, player.netname);
 	}
 	return true;