Fix players getting stuck in team unassigned on join

bakugo · EricS-Valve · commit a85998aec565 · 2025-11-06T08:34:33.000-08:00
diff --git a/src/game/server/tf/tf_player.cpp b/src/game/server/tf/tf_player.cpp
@@ -7343,7 +7343,7 @@ bool CTFPlayer::ClientCommand( const CCommand &args )
 	if ( FStrEq( pcmd, "jointeam" ) )
 	{
 		// don't let them spam the server with changes
-		if ( GetNextChangeTeamTime() > gpGlobals->curtime )
+		if ( GetNextChangeTeamTime() > gpGlobals->curtime && GetTeamNumber() != TEAM_UNASSIGNED )
 			return true;
 
 		SetNextChangeTeamTime( gpGlobals->curtime + 2.0f );  // limit to one change every 2 secs

Original file line number	Diff line number	Diff line change
`@@ -7343,7 +7343,7 @@ bool CTFPlayer::ClientCommand( const CCommand &args )`
`7343`	`7343`	`if ( FStrEq( pcmd, "jointeam" ) )`
`7344`	`7344`	`{`
`7345`	`7345`	`// don't let them spam the server with changes`
`7346`		`- if ( GetNextChangeTeamTime() > gpGlobals->curtime )`
	`7346`	`+ if ( GetNextChangeTeamTime() > gpGlobals->curtime && GetTeamNumber() != TEAM_UNASSIGNED )`
`7347`	`7347`	`return true;`
`7348`	`7348`
`7349`	`7349`	`SetNextChangeTeamTime( gpGlobals->curtime + 2.0f ); // limit to one change every 2 secs`