Merge remote-tracking branch 'public-gitlab/21-version' into versionflags
This commit is contained in:
commit
6d9fb0d3fd
|
@ -2650,13 +2650,16 @@ static void Command_Kick(void)
|
||||||
if (pn == -1 || pn == 0)
|
if (pn == -1 || pn == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Special case if we are trying to kick a player who is downloading the game state:
|
if (server)
|
||||||
// trigger a timeout instead of kicking them, because a kick would only
|
|
||||||
// take effect after they have finished downloading
|
|
||||||
if (sendingsavegame[playernode[pn]])
|
|
||||||
{
|
{
|
||||||
Net_ConnectionTimeout(playernode[pn]);
|
// Special case if we are trying to kick a player who is downloading the game state:
|
||||||
return;
|
// trigger a timeout instead of kicking them, because a kick would only
|
||||||
|
// take effect after they have finished downloading
|
||||||
|
if (sendingsavegame[playernode[pn]])
|
||||||
|
{
|
||||||
|
Net_ConnectionTimeout(playernode[pn]);
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
WRITESINT8(p, pn);
|
WRITESINT8(p, pn);
|
||||||
|
|
Loading…
Reference in New Issue