X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcommand%2Fsv_cmd.qc;h=5e13be8f609507e6a7517bbbb0cbb17ae01138a8;hp=5ff2d3472ae22ebbf2d3d898e0ecbd5f4ae4c910;hb=b75d7a06af7c54b520b7c021e0d5bc9e51a83b53;hpb=0d0a2025de767dbfae0519941294f5947fe38c1f

diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc
index 5ff2d3472..5e13be8f6 100644
--- a/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@ -1050,58 +1050,20 @@ void GameCommand_moveplayer(int request, int argc)
 								Player_SetForcedTeamIndex(client, save);
 
 								// Check to see if the destination team is even available
-								switch (team_id)
+								int real_team_id = Team_TeamToIndex(team_id);
+								if (real_team_id == -1)
 								{
-									case NUM_TEAM_1:
-									{
-										if (!TeamBalance_IsTeamAllowed(balance, 1))
-										{
-											LOG_INFO("Sorry, can't move player to red team if it doesn't exist.");
-											TeamBalance_Destroy(balance);
-											return;
-										}
-										TeamBalance_Destroy(balance);
-										break;
-									}
-									case NUM_TEAM_2:
-									{
-										if (!TeamBalance_IsTeamAllowed(balance, 2))
-										{
-											LOG_INFO("Sorry, can't move player to blue team if it doesn't exist.");
-											TeamBalance_Destroy(balance);
-											return;
-										}
-										TeamBalance_Destroy(balance);
-										break;
-									}
-									case NUM_TEAM_3:
-									{
-										if (!TeamBalance_IsTeamAllowed(balance, 3))
-										{
-											LOG_INFO("Sorry, can't move player to yellow team if it doesn't exist.");
-											TeamBalance_Destroy(balance);
-											return;
-										}
-										TeamBalance_Destroy(balance);
-										break;
-									}
-									case NUM_TEAM_4:
-									{
-										if (!TeamBalance_IsTeamAllowed(balance, 4))
-										{
-											LOG_INFO("Sorry, can't move player to pink team if it doesn't exist.");
-											TeamBalance_Destroy(balance);
-											return;
-										}
-										TeamBalance_Destroy(balance);
-										break;
-									}
-									default:
-									{
-										LOG_INFO("Sorry, can't move player here if team ", destination, " doesn't exist.");
-										return;
-									}
+									LOG_INFO("Sorry, can't move player here if team ", destination, " doesn't exist.");
+									TeamBalance_Destroy(balance);
+									return;
+								}
+								if (!TeamBalance_IsTeamAllowed(balance, real_team_id))
+								{
+									LOG_INFOF("Sorry, can't move player to %s team if it doesn't exist.", destination);
+									TeamBalance_Destroy(balance);
+									return;
 								}
+								TeamBalance_Destroy(balance);
 
 								// If so, lets continue and finally move the player
 								Player_SetForcedTeamIndex(client, TEAM_FORCE_DEFAULT);
@@ -1145,8 +1107,8 @@ void GameCommand_moveplayer(int request, int argc)
 			LOG_INFO("  'clients' is a list (separated by commas) of player entity ID's or nicknames");
 			LOG_INFO("  'destination' is what to send the player to, be it team or spectating");
 			LOG_INFO("  Full list of destinations here: \"spec, spectator, red, blue, yellow, pink, auto.\"");
-			LOG_INFO("Examples: sv_cmd moveplayer 1,3,5 red 3");
-			LOG_INFO("          sv_cmd moveplayer 2 spec ");
+			LOG_INFO("Examples: sv_cmd moveplayer 1,3,5 red");
+			LOG_INFO("          sv_cmd moveplayer 2 spec");
 			LOG_INFO("See also: ^2allspec, shuffleteams^7");
 			return;
 		}