Skip to content

Prevent players from getting into the game without a team when both teams are full #1168

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

Merged
s1lentq merged 2 commits into from
Jul 9, 2026
Merged

Prevent players from getting into the game without a team when both teams are full #1168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3143815
Prevent mp_forcerespawn from spawning players without a team
belomaxorka Jul 5, 2026
7d97e08
Deny auto-team-select when both teams are full
belomaxorka Jul 5, 2026
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 regamedll/dlls/client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1893,6 +1893,15 @@ BOOL EXT_FUNC __API_HOOK(HandleMenu_ChooseTeam)(CBasePlayer *pPlayer, int slot)
}
}

#ifdef REGAMEDLL_FIXES
// Both teams are full and no bot could be vacated, deny;
// otherwise the player would get into the game while on UNASSIGNED team
if (team == UNASSIGNED)
{
return FALSE;
}
#endif

break;
}
case MENU_SLOT_TEAM_SPECT:
Expand Down
3 changes: 2 additions & 1 deletion regamedll/dlls/player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10731,7 +10731,8 @@ bool EXT_FUNC CBasePlayer::__API_HOOK(GetIntoGame)()
void CBasePlayer::PlayerRespawnThink()
{
#ifdef REGAMEDLL_ADD
if (GetObserverMode() != OBS_NONE && (m_iTeam == UNASSIGNED || m_iTeam == SPECTATOR))
// Players without a team can never respawn (e.g. stuck at team menu when both teams are full)
if (m_iTeam == UNASSIGNED || m_iTeam == SPECTATOR)
return;

// Player cannot respawn while in the Choose Appearance menu
Expand Down
Loading