edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't check sv_max_team_size for teams in practice

Browse source
This commit is contained in:
furo 2024-06-24 18:21:42 +02:00
parent 003a58cdc7
commit 93bf7cbc59
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/server/ddracechat.cpp
View file

@ -1050,7 +1050,7 @@ void CGameContext::AttemptJoinTeam(int ClientId, int Team)
"This team is locked using /lock. Only members of the team can unlock it using /lock." :
"This team is locked using /lock. Only members of the team can invite you or unlock it using /lock.");
}
else if(Team > 0 && Team < MAX_CLIENTS && m_pController->Teams().Count(Team) >= g_Config.m_SvMaxTeamSize && !m_pController->Teams().TeamFlock(Team))
else if(Team > 0 && Team < MAX_CLIENTS && m_pController->Teams().Count(Team) >= g_Config.m_SvMaxTeamSize && !m_pController->Teams().TeamFlock(Team) && !m_pController->Teams().IsPractice(Team))
{
char aBuf[512];
str_format(aBuf, sizeof(aBuf), "This team already has the maximum allowed size of %d players", g_Config.m_SvMaxTeamSize);

9
src/game/server/teams.cpp
View file

@ -1106,6 +1106,15 @@ void CGameTeams::OnCharacterDeath(int ClientId, int Weapon)
if(Count(Team) > 1)
{
// Disband team if the team has more players than allowed.
if(Count(Team) > g_Config.m_SvMaxTeamSize)
{
GameServer()->SendChatTeam(Team, "This team was disbanded because there are more players than allowed in the team.");
SetTeamLock(Team, false);
KillTeam(Team, Weapon == WEAPON_SELF ? ClientId : -1, ClientId);
return;
}
KillTeam(Team, Weapon == WEAPON_SELF ? ClientId : -1, ClientId);
char aBuf[512];