From 39d9dc99aa71ce13fe7757b8d5cd4cfaa3b29bb7 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Sat, 22 Jul 2023 14:33:32 +0100
Subject: [PATCH] FinalisePlaystateChange: Don't reset spectatorReentry timer
 if it's already nonzero

---
 src/d_netcmd.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index f5e2f26e1..7f1042f8c 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -1617,7 +1617,11 @@ static void FinalisePlaystateChange(INT32 playernum)
 		// To attempt to discourage rage-spectators, we delay any rejoining.
 		// If you're engaging in a DUEL and quit early, in addition to the
 		// indignity of losing your PWR, you get a special extra-long delay.
-		if (netgame && players[playernum].jointime > 1)
+		if (
+			netgame
+			&& players[playernum].jointime > 1
+			&& players[playernum].spectatorReentry == 0
+		)
 		{
 			UINT8 pcount = 0;