From 8755582901c70a8eff73084690d50da29d9c93cd Mon Sep 17 00:00:00 2001
From: AJ Martinez <aj@worldsbe.st>
Date: Fri, 14 Jul 2023 02:33:33 -0700
Subject: [PATCH] Don't submit future ticcmds if they could overwrite a needed
 ticcmd

---
 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 7d62272ff1..2106191640 100755
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -4567,7 +4567,8 @@ static void HandlePacketFromPlayer(SINT8 node)
 
 			// If we've alredy received a ticcmd for this tic, just submit it for the next one.
 			tic_t faketic = maketic;
-			if (!!(netcmds[maketic % BACKUPTICS][netconsole].angleturn & TICCMD_RECEIVED))
+			if ((!!(netcmds[maketic % BACKUPTICS][netconsole].angleturn & TICCMD_RECEIVED))
+				&& (maketic - firstticstosend < BACKUPTICS))
 				faketic++;
 
 			// Copy ticcmd
-- 
GitLab