Skip to content

Fix: assign players to a team immediately to stop malicious users #1639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix: assign players to a team immediately to stop malicious users #1639

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5991b2
Fix: assign players to a team immediately to stop malicious users
Pandaptable Nov 9, 2025
59e67d2
Use ToTfPlayer
Pandaptable Nov 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/game/client/tf/vgui/tf_mapinfomenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,15 @@ void CTFMapInfoMenu::OnCommand( const char *command )
engine->ClientCmd( "team_ui_setup" );
}
}
else
{
CTFPlayer* pPlayer = dynamic_cast< CTFPlayer* >( C_BasePlayer::GetLocalPlayer() );
C_TFPlayerClass* pClass = pPlayer ? pPlayer->GetPlayerClass() : NULL;
if ( pClass && pClass->GetClassIndex() == TF_CLASS_UNDEFINED )
{
m_pViewPort->ShowPanel( ( pPlayer->GetTeamNumber() == TF_TEAM_BLUE ) ? PANEL_CLASS_BLUE : PANEL_CLASS_RED, true );
}
}

UTIL_IncrementMapKey( "viewed" );
}
Expand Down
9 changes: 9 additions & 0 deletions src/game/server/tf/tf_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13663,6 +13663,15 @@ void CTFPlayer::StateEnterWELCOME( void )
}

m_bSeenRoundInfo = false;

if ( ShouldForceAutoTeam() && GetTeamNumber() == TEAM_UNASSIGNED )
{
// Players are not considered to be on a team until they click continue on the MOTD screen
// Players not on a team do not show up in the vote UI, malicious players are currently clogging up slots and avoiding vote kicks by never clicking continue
// MvM already has a specific fix for this by allowing players to kick unassigned players but that doesn't work in regular modes, this is a proper fix for all modes
int iTeam = GetAutoTeam();
ChangeTeam( iTeam, true, false );
}
}

}
Expand Down