From 5afe936dd984f4af60da8450fc7b9d478ce0eab1 Mon Sep 17 00:00:00 2001
From: TehRealSalt <tehrealsalt@gmail.com>
Date: Mon, 11 Mar 2019 11:01:01 -0400
Subject: [PATCH] Remove Eggman monitor early detonation, allow using rings
 during the countdown

---
 src/k_kart.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index 161b3d0ce..b89522dc1 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -5463,8 +5463,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 			|| player->kartstuff[k_itemamount]
 			|| player->kartstuff[k_itemroulette]
 			|| player->kartstuff[k_growshrinktimer]
-			|| player->kartstuff[k_rocketsneakertimer]
-			|| player->kartstuff[k_eggmanexplode]))
+			|| player->kartstuff[k_rocketsneakertimer]))
 			player->kartstuff[k_userings] = 1;
 		else
 			player->kartstuff[k_userings] = 0;
@@ -5529,14 +5528,8 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 			// Other items
 			else
 			{
-				// Eggman Monitor exploding
-				if (player->kartstuff[k_eggmanexplode])
-				{
-					if (ATTACK_IS_DOWN && player->kartstuff[k_eggmanexplode] <= 3*TICRATE && player->kartstuff[k_eggmanexplode] > 1)
-						player->kartstuff[k_eggmanexplode] = 1;
-				}
 				// Eggman Monitor throwing
-				else if (player->kartstuff[k_eggmanheld])
+				if (player->kartstuff[k_eggmanheld])
 				{
 					if (ATTACK_IS_DOWN)
 					{