From 3eff2ef29218602bdf6c5f865d8e8f2e630e5bf6 Mon Sep 17 00:00:00 2001 From: Oni Date: Mon, 24 Jul 2023 23:12:41 +0000 Subject: [PATCH] Merge branch 'dont-rewrite-the-past' into 'master' Don't rewrite the past if we might still need to send it See merge request KartKrew/Kart!1333 --- src/d_clisrv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index f916f11de..8935fbf94 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -4659,7 +4659,8 @@ static void HandlePacketFromPlayer(SINT8 node) // If we already received a ticcmd for this tic, just submit it for the next one. tic_t faketic = maketic; - if (!!(netcmds[maketic % BACKUPTICS][netconsole].flags & TICCMD_RECEIVED)) + if ((!!(netcmds[maketic % BACKUPTICS][netconsole].flags & TICCMD_RECEIVED)) + && (maketic - firstticstosend < BACKUPTICS)) faketic++; // Copy ticcmd