From a19ce98350aa1e12bdc6c44f2d99ffc5750ec4fb Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Mon, 2 Nov 2020 05:15:45 -0500
Subject: [PATCH] Fix positions tying at 2nd place

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

diff --git a/src/k_kart.c b/src/k_kart.c
index 8bf94a65c..29dfe1d67 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -6820,24 +6820,30 @@ void K_KartUpdatePosition(player_t *player)
 			}
 			else
 			{
-				if (K_NumEmeralds(&players[i]) > K_NumEmeralds(player))
+				UINT8 myEmeralds = K_NumEmeralds(player);
+				UINT8 yourEmeralds = K_NumEmeralds(&players[i]);
+
+				if (yourEmeralds > myEmeralds)
 				{
+					// Emeralds matter above all
 					position++;
 				}
-				else if (players[i].bumpers > player->bumpers)
+				else if (yourEmeralds == myEmeralds)
 				{
-					position++;
+					// Bumpers are a tie breaker
+					if (players[i].bumpers > player->bumpers)
+					{
+						position++;
+					}
+					else if (players[i].bumpers == player->bumpers)
+					{
+						// Score is the second tier tie breaker
+						if (players[i].marescore > player->marescore)
+						{
+							position++;
+						}
+					}
 				}
-				else if (players[i].marescore > player->marescore)
-				{
-					position++;
-				}
-				/*
-				else if (players[i].kartstuff[k_wanted] > player->kartstuff[k_wanted])
-				{
-					position++;
-				}
-				*/
 			}
 		}
 	}