From f3742bad9d180527e8c3051343edb00ac3d978ef Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Wed, 21 Sep 2022 19:02:38 -0400
Subject: [PATCH] Safe-guard SPB from 1st place

---
 src/k_kart.c | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index 7024c8162..b4ce811e6 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -584,6 +584,7 @@ INT32 K_KartGetItemOdds(
 	SINT8 first = -1, second = -1;
 	UINT32 firstDist = 0;
 	UINT32 secondToFirst = 0;
+	boolean isFirst = false;
 
 	boolean powerItem = false;
 	boolean cooldownOnStart = false;
@@ -658,19 +659,24 @@ INT32 K_KartGetItemOdds(
 		}
 	}
 
-	if (first != -1 && second != -1) // calculate 2nd's distance from 1st, for SPB
+	if (first != -1) // calculate 2nd's distance from 1st, for SPB
 	{
 		firstDist = players[first].distancetofinish;
 
+		isFirst = (ourDist <= firstDist);
+
 		if (mapobjectscale != FRACUNIT)
 		{
 			firstDist = FixedDiv(firstDist * FRACUNIT, mapobjectscale) / FRACUNIT;
 		}
 
-		secondToFirst = K_ScaleItemDistance(
-			players[second].distancetofinish - players[first].distancetofinish,
-			pingame
-		);
+		if (second != -1)
+		{
+			secondToFirst = K_ScaleItemDistance(
+				players[second].distancetofinish - players[first].distancetofinish,
+				pingame
+			);
+		}
 	}
 
 	switch (item)
@@ -714,7 +720,8 @@ INT32 K_KartGetItemOdds(
 			indirectItem = true;
 			notNearEnd = true;
 
-			if (firstDist < ENDDIST*2) // No SPB when 1st is almost done
+			if (firstDist < ENDDIST*2 // No SPB when 1st is almost done
+				|| isFirst == true) // No SPB for 1st ever
 			{
 				newodds = 0;
 			}
@@ -1108,8 +1115,12 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
 
 	// SPECIAL CASE No. 5:
 	// Force SPB onto 2nd if they get too far behind
-	if ((gametyperules & GTR_CIRCUIT) && pdis > SPBFORCEDIST
-		&& spbplace == -1 && !indirectitemcooldown && !dontforcespb
+	if ((gametyperules & GTR_CIRCUIT)
+		&& player->position > 1
+		&& pdis > SPBFORCEDIST
+		&& spbplace == -1
+		&& !indirectitemcooldown
+		&& !dontforcespb
 		&& cv_selfpropelledbomb.value)
 	{
 		K_KartGetItemResult(player, KITEM_SPB);