Merge remote-tracking branch 'public-gitlab/21-version' into versionflags

This commit is contained in:
mazmazz 2018-12-05 12:49:21 -05:00
commit 6d9fb0d3fd
1 changed files with 9 additions and 6 deletions

View File

@ -2650,6 +2650,8 @@ static void Command_Kick(void)
if (pn == -1 || pn == 0)
return;
if (server)
{
// Special case if we are trying to kick a player who is downloading the game state:
// trigger a timeout instead of kicking them, because a kick would only
// take effect after they have finished downloading
@ -2658,6 +2660,7 @@ static void Command_Kick(void)
Net_ConnectionTimeout(playernode[pn]);
return;
}
}
WRITESINT8(p, pn);