From b6804b1ded114d1e3aa92994750df85d729547b3 Mon Sep 17 00:00:00 2001
From: yamamama <anonimus.srb2k@gmail.com>
Date: Sun, 19 Apr 2026 07:51:57 -0400
Subject: [PATCH] Try to make sure consoleplayer is set up before game ticks
 run

---
 src/d_clisrv.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 33802170e..041dff59d 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -6972,6 +6972,12 @@ boolean TryRunTics(tic_t realtics)
 					dontRun = false;
 				}
 
+				if ((gamestate == GS_LEVEL) && (!(addedtogame || dedicated)))
+				{
+					// Prevent race conditions by not running game ticks if we're not added to the game yet
+					dontRun = true;
+				}
+
 				if (dontRun == false)
 				{
 					if (levelloading == true)