X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fteamplay.qc;h=11509b5428a74f26d96fdc29c21bdfb7019317e5;hb=e4ad6899ea71b0b94c00b079477daac85e8d2fa2;hp=7abd4e6bc47f100d307a8d4fb63e4cff05e2e7e5;hpb=8a55eb2e9db747e0192d2e3801e08dec93b0c29a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 7abd4e6bc..11509b542 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -209,38 +209,39 @@ bool Player_SetTeamIndex(entity player, int index)
 bool SetPlayerTeam(entity player, int team_index, int type)
 {
 	int old_team_index = Entity_GetTeamIndex(player);
+
 	if (!Player_SetTeamIndex(player, team_index))
-	{
 		return false;
-	}
+
 	LogTeamChange(player.playerid, player.team, type);
+
 	if (team_index != old_team_index)
 	{
-		PlayerScore_Clear(player);
-		if (team_index != -1)
-		{
-			Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(
-				player.team, INFO_JOIN_PLAY_TEAM), player.netname);
-		}
-		else
-		{
-			if (!CS(player).just_joined)
-			{
-				Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_QUIT_SPECTATE,
-					player.netname);
-			}
-		}
 		KillPlayerForTeamChange(player);
+		PlayerScore_Clear(player);
+		CS(player).parm_idlesince = time;
+
 		if (!IS_BOT_CLIENT(player))
-		{
 			TeamBalance_AutoBalanceBots();
-		}
+
+		if (team_index != -1)
+			Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(player.team, INFO_JOIN_PLAY_TEAM), player.netname);
 	}
-	else if (team_index == -1)
+
+	if (team_index == -1)
 	{
-		if (!CS(player).just_joined && player.frags != FRAGS_SPECTATOR)
+		if (autocvar_sv_maxidle_playertospectator > 0 && CS(player).idlekick_lasttimeleft)
+		{
+			// this done here so it happens even when manually speccing during the countdown
+			Kill_Notification(NOTIF_ONE_ONLY, player, MSG_CENTER, CPID_IDLING);
+			CS(player).idlekick_lasttimeleft = 0;
+		}
+		else if (!CS(player).just_joined && player.frags != FRAGS_SPECTATOR)
+		{
 			Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_QUIT_SPECTATE, player.netname);
+		}
 	}
+
 	return true;
 }