From 4de8c7a49f715beb5fc51705df5ba751cbb77b20 Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Sat, 13 Apr 2024 17:28:45 -0400
Subject: [PATCH] Fix Prisons reset behavior

The elimination behavior was completely preventing the prisons behavior from even being checked.
---
 src/k_battle.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/k_battle.c b/src/k_battle.c
index 5e1b51a01..9a6213a0c 100644
--- a/src/k_battle.c
+++ b/src/k_battle.c
@@ -179,25 +179,25 @@ void K_CheckBumpers(void)
 			return;
 		}
 	}
-	else if (eliminated >= numingame - 1)
+	else if (numingame > 1)
 	{
 		// If every other player is eliminated, the
 		// last player standing wins by default.
-		if (numingame > 1)
+		if (eliminated >= numingame - 1)
+		{
 			K_EndBattleRound(kingofthehill != -1 ? &players[kingofthehill] : NULL);
-		return;
+			return;
+		}
 	}
-
-	if (numingame <= 1)
+	else
 	{
 		if ((gametyperules & GTR_PRISONS) && !battleprisons && (K_CanChangeRules(true) == true))
 		{
 			// Reset map to turn on battle prisons
 			if (server)
 				D_MapChange(gamemap, gametype, encoremode, true, 0, false, false);
+			return;
 		}
-
-		return;
 	}
 }