From: terencehill <piuntn@gmail.com>
Date: Wed, 23 Dec 2015 12:51:57 +0000 (+0100)
Subject: Fix another message: "player X connecting..." wasn't shown in DM games
X-Git-Tag: xonotic-v0.8.2~1428^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=901ec682a64beedccbd90d177d86e591fea9ea23;p=xonotic%2Fxonotic-data.pk3dir.git

Fix another message: "player X connecting..." wasn't shown in DM games
---

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 80b0817ca..60116bada 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -583,10 +583,8 @@ void SV_ChangeTeam(float _color)
 	float scolor, dcolor, steam, dteam; //, dbotcount, scount, dcount;
 
 	// in normal deathmatch we can just apply the color and we're done
-	if(!teamplay) {
+	if(!teamplay)
 		SetPlayerColors(self, _color);
-		return;
-	}
 
 	if(!IS_CLIENT(self))
 	{
@@ -595,6 +593,9 @@ void SV_ChangeTeam(float _color)
 		return;
 	}
 
+	if(!teamplay)
+		return;
+
 	scolor = self.clientcolors & 0x0F;
 	dcolor = _color & 0x0F;