From 8a92f03f7b969bef684acbff25ff37a99274c50e Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Tue, 27 Dec 2022 22:57:01 -0800
Subject: [PATCH] Set fuse for Battle items

---
 src/k_battle.h | 1 +
 src/k_kart.c   | 5 +++++
 src/p_mobj.c   | 1 +
 3 files changed, 7 insertions(+)

diff --git a/src/k_battle.h b/src/k_battle.h
index 68f3c1432..f64cfa967 100644
--- a/src/k_battle.h
+++ b/src/k_battle.h
@@ -9,6 +9,7 @@ extern "C" {
 #endif
 
 #define BATTLE_SPAWN_INTERVAL (4*TICRATE)
+#define BATTLE_DESPAWN_TIME (15*TICRATE)
 
 extern struct battleovertime
 {
diff --git a/src/k_kart.c b/src/k_kart.c
index bb33f7493..660878d4c 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -6273,6 +6273,11 @@ mobj_t *K_CreatePaperItem(fixed_t x, fixed_t y, fixed_t z, angle_t angle, SINT8
 	P_SetTarget(&backdrop->tracer, drop);
 	backdrop->flags2 |= MF2_LINKDRAW;
 
+	if (gametyperules & GTR_BUMPERS)
+	{
+		drop->fuse = BATTLE_DESPAWN_TIME;
+	}
+
 	return drop;
 }
 
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 8bdd50fd4..f965d32c8 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -9522,6 +9522,7 @@ static boolean P_CanFlickerFuse(mobj_t *mobj)
 		case MT_RANDOMITEM:
 		case MT_EGGMANITEM:
 		case MT_FALLINGROCK:
+		case MT_FLOATINGITEM:
 			if (mobj->fuse <= TICRATE)
 			{
 				return true;