From 44605bbce6ee02e2953bf615baca09084c221f79 Mon Sep 17 00:00:00 2001
From: NepDisk <nepdisk@noreply.codeberg.org>
Date: Wed, 1 Oct 2025 17:46:24 -0400
Subject: [PATCH] Port RR karteliminate last changes

---
 src/d_netcmd.c | 5 -----
 src/p_inter.c  | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 5a8ff526a..21fd66e97 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -7403,11 +7403,6 @@ static void KartComeback_OnChange(void)
 
 static void KartEliminateLast_OnChange(void)
 {
-	if (K_CanChangeRules() == false)
-	{
-		CV_StealthSet(&cv_karteliminatelast, cv_karteliminatelast.defaultvalue);
-	}
-
 	P_CheckRacers();
 }
 
diff --git a/src/p_inter.c b/src/p_inter.c
index 1970e8bc5..edfed3935 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -1160,7 +1160,7 @@ boolean P_CheckRacers(void)
 {
 	const boolean griefed = (spectateGriefed > 0);
 
-	boolean eliminateLast = cv_karteliminatelast.value;
+	boolean eliminateLast = (!K_CanChangeRules() || (cv_karteliminatelast.value != 0));
 	boolean allHumansDone = true;
 	//boolean allBotsDone = true;