From 2e4675b7f7c4e916860f0430e624c1fe5db10fbc Mon Sep 17 00:00:00 2001 From: Antonio Martinez Date: Sun, 14 Sep 2025 04:08:03 -0400 Subject: [PATCH] Fix midrace joins being impossible when bots are present --- src/k_kart.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 9c57c402b..a2369972d 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -16351,10 +16351,8 @@ void K_CheckSpectateStatus(boolean considermapreset) // Mid-race joins cause all kind of jank, including replay issues // that literally none of us can figure out. Whoops. - if (numingame < 2 || leveltime == 0) - continue; - - return; + if (numhumans > 1 && leveltime != 0) + return; // Unseal when someone feels like debugging. #if 0 @@ -16471,9 +16469,8 @@ void K_CheckSpectateStatus(boolean considermapreset) return; // Reset the match when 2P joins 1P, DUEL mode - // Reset the match when 3P joins 1P and 2P, DUEL mode must be disabled extern consvar_t cv_debugnewchallenger; - if (i > 0 && !mapreset && gamestate == GS_LEVEL && (previngame < 3 && numingame >= 2) && !cv_debugnewchallenger.value) + if (i > 0 && !mapreset && gamestate == GS_LEVEL && ((previngame < 3 && numingame >= 2) || (numhumans <= 2)) && !cv_debugnewchallenger.value) { Music_Play("comeon"); // COME ON mapreset = 3*TICRATE; // Even though only the server uses this for game logic, set for everyone for HUD