X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fclientcommands.qc;h=0cbe3017eae1ef889844324e8649a1c6cf036d8b;hb=d822e9e15e991a67e09e68f50a61cff487502328;hp=df19ab592f4779beb94a38881992e37150a43ae0;hpb=b8482f4135878ec2af59ecb484c2d6cd97562d18;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/clientcommands.qc b/qcsrc/server/clientcommands.qc
index df19ab592..0cbe3017e 100644
--- a/qcsrc/server/clientcommands.qc
+++ b/qcsrc/server/clientcommands.qc
@@ -171,7 +171,7 @@ void SV_ParseClientCommand(string s) {
 			PutClientInServer();
 		} else if(cvar("g_campaign") || cvar("g_balance_teams") || cvar("g_balance_teams_force")) {
 			//JoinBestTeam(self, FALSE, TRUE);
-		} else if(teams_matter && !cvar("sv_spectate")) {
+		} else if(teams_matter && !cvar("sv_spectate") && !(self.team_forced > 0)) {
 			self.classname = "observer";
 			stuffcmd(self,"menu_showteamselect\n");
 		}
@@ -249,9 +249,11 @@ void SV_ParseClientCommand(string s) {
 		if not(self.flags & FL_CLIENT)
 			return;
 		if( !teams_matter ) {
-			sprint( self, "selecteam can only be used in teamgames\n");
+			sprint( self, "selectteam can only be used in teamgames\n");
 		} else if(cvar("g_campaign")) {
 			//JoinBestTeam(self, 0);
+		} else if(self.team_forced > 0) {
+			sprint( self, "selectteam can not be used as your team is forced\n");
 		} 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" ) {