stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-27 12:50:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fix-dedi-node-takeover' into 'master'

Browse source 
Fix dedicated node takeover

See merge request KartKrew/Kart-Public!308
This commit is contained in:
Sal 2022-08-30 05:42:05 +00:00
commit 48ddb25fd6
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/d_clisrv.c
View file

@ -4334,6 +4334,11 @@ static void HandleConnect(SINT8 node)
// If a server filled out, then it'd overwrite the host and turn everyone into weird husks..... // If a server filled out, then it'd overwrite the host and turn everyone into weird husks.....
// It's too much effort to legimately fix right now. Just prevent it from reaching that state. // It's too much effort to legimately fix right now. Just prevent it from reaching that state.
UINT8 maxplayers = min((dedicated ? MAXPLAYERS-1 : MAXPLAYERS), cv_maxplayers.value); UINT8 maxplayers = min((dedicated ? MAXPLAYERS-1 : MAXPLAYERS), cv_maxplayers.value);
UINT8 connectedplayers = 0;
for (UINT8 i = dedicated ? 1 : 0; i < MAXPLAYERS; i++)
if (playernode[i] != UINT8_MAX) // We use this to count players because it is affected by SV_AddWaitingPlayers when more than one client joins on the same tic, unlike playeringame and D_NumPlayers. UINT8_MAX denotes no node for that player
connectedplayers++;
if (bannednode && bannednode[node].banid != SIZE_MAX) if (bannednode && bannednode[node].banid != SIZE_MAX)
{ {
@ -4391,7 +4396,7 @@ static void HandleConnect(SINT8 node)
{ {
SV_SendRefuse(node, M_GetText("The server is not accepting\njoins for the moment.")); SV_SendRefuse(node, M_GetText("The server is not accepting\njoins for the moment."));
} }
else if (D_NumPlayers() >= maxplayers) else if (connectedplayers >= maxplayers)
{ {
SV_SendRefuse(node, va(M_GetText("Maximum players reached: %d"), maxplayers)); SV_SendRefuse(node, va(M_GetText("Maximum players reached: %d"), maxplayers));
} }
@ -4399,7 +4404,7 @@ static void HandleConnect(SINT8 node)
{ {
SV_SendRefuse(node, M_GetText("Too many players from\nthis node.")); SV_SendRefuse(node, M_GetText("Too many players from\nthis node."));
} }
else if (netgame && D_NumPlayers() + netbuffer->u.clientcfg.localplayers > maxplayers) else if (netgame && connectedplayers + netbuffer->u.clientcfg.localplayers > maxplayers)
{ {
SV_SendRefuse(node, va(M_GetText("Number of local players\nwould exceed maximum: %d"), maxplayers)); SV_SendRefuse(node, va(M_GetText("Number of local players\nwould exceed maximum: %d"), maxplayers));
} }