From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 12 Dec 2011 08:44:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/terencehill/g_changeteam_banned_fix'
X-Git-Tag: xonotic-v0.6.0~74^2~110
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=d7931068ce37d3f05c0f4e4f052ff8e43ac9f0e4;hp=c1af3f3b1a02a1c7596d75c912f8750ebbb2587b

Merge remote-tracking branch 'origin/terencehill/g_changeteam_banned_fix'
---

diff --git a/qcsrc/server/clientcommands.qc b/qcsrc/server/clientcommands.qc
index b62f34f233..7f52f8f8c9 100644
--- a/qcsrc/server/clientcommands.qc
+++ b/qcsrc/server/clientcommands.qc
@@ -278,25 +278,33 @@ void SV_ParseClientCommand(string s) {
 		} else if(lockteams) {
 			sprint( self, "^7The game has already begun, you must wait until the next map to be able to join a team.\n");
 		} else if( argv(1) == "red" ) {
-			if(self.team != COLOR_TEAM1 || self.deadflag != DEAD_NO)
-				ClientKill_TeamChange(COLOR_TEAM1);
-			else
+			if(self.team == COLOR_TEAM1 && self.deadflag == DEAD_NO)
 				sprint( self, "^7You already are on that team.\n");
-		} else if( argv(1) == "blue" ) {
-			if(self.team != COLOR_TEAM2 || self.deadflag != DEAD_NO)
-				ClientKill_TeamChange(COLOR_TEAM2);
+			else if (self.wasplayer && autocvar_g_changeteam_banned)
+				sprint( self, "^1You cannot change team, forbidden by the server.\n");
 			else
+				ClientKill_TeamChange(COLOR_TEAM1);
+		} else if( argv(1) == "blue" ) {
+			if(self.team == COLOR_TEAM2 && self.deadflag == DEAD_NO)
 				sprint( self, "^7You already are on that team.\n");
-		} else if( argv(1) == "yellow" ) {
-			if(self.team != COLOR_TEAM3 || self.deadflag != DEAD_NO)
-				ClientKill_TeamChange(COLOR_TEAM3);
+			else if (self.wasplayer && autocvar_g_changeteam_banned)
+				sprint( self, "^1You cannot change team, forbidden by the server.\n");
 			else
+				ClientKill_TeamChange(COLOR_TEAM2);
+		} else if( argv(1) == "yellow" ) {
+			if(self.team == COLOR_TEAM3 && self.deadflag == DEAD_NO)
 				sprint( self, "^7You already are on that team.\n");
-		} else if( argv(1) == "pink" ) {
-			if(self.team != COLOR_TEAM4 || self.deadflag != DEAD_NO)
-				ClientKill_TeamChange(COLOR_TEAM4);
+			else if (self.wasplayer && autocvar_g_changeteam_banned)
+				sprint( self, "^1You cannot change team, forbidden by the server.\n");
 			else
+				ClientKill_TeamChange(COLOR_TEAM3);
+		} else if( argv(1) == "pink" ) {
+			if(self.team == COLOR_TEAM4 && self.deadflag == DEAD_NO)
 				sprint( self, "^7You already are on that team.\n");
+			else if (self.wasplayer && autocvar_g_changeteam_banned)
+				sprint( self, "^1You cannot change team, forbidden by the server.\n");
+			else
+				ClientKill_TeamChange(COLOR_TEAM4);
 		} else if( argv(1) == "auto" ) {
 			ClientKill_TeamChange(-1);
 		} else {