From 04bc0b6b9d3c0c1f41ddf7477807603428975570 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Thu, 23 Mar 2023 19:38:43 -0700
Subject: [PATCH] Add fuse to Emeralds in Battle, same as dropped items

---
 src/k_battle.c | 5 +++++
 src/p_mobj.c   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/k_battle.c b/src/k_battle.c
index 31052cb6f..2ee0e42d4 100644
--- a/src/k_battle.c
+++ b/src/k_battle.c
@@ -247,6 +247,11 @@ mobj_t *K_SpawnChaosEmerald(fixed_t x, fixed_t y, fixed_t z, angle_t angle, SINT
 	P_SetMobjState(overlay, S_CHAOSEMERALD_UNDER);
 	overlay->color = emerald->color;
 
+	if (gametyperules & GTR_BUMPERS)
+	{
+		emerald->fuse = BATTLE_DESPAWN_TIME;
+	}
+
 	return emerald;
 }
 
diff --git a/src/p_mobj.c b/src/p_mobj.c
index e0a71242c..dc79dc373 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -9636,6 +9636,7 @@ static boolean P_CanFlickerFuse(mobj_t *mobj)
 		case MT_FLOATINGITEM:
 		case MT_POGOSPRING:
 		case MT_KART_LEFTOVER:
+		case MT_EMERALD:
 			if (mobj->fuse <= TICRATE)
 			{
 				return true;