From bb8b308312eb7d71bc3a9c884b1ea203d2b2bda9 Mon Sep 17 00:00:00 2001
From: AJ Martinez <aj@worldsbe.st>
Date: Sat, 6 Jan 2024 02:19:30 -0700
Subject: [PATCH] Block Rhythm Badge activation when holding items

---
 src/k_kart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index a8a2bd46e..1565dcb7b 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -11581,7 +11581,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 		if (K_PowerUpRemaining(player, POWERUP_BADGE))
 		{
 			chargingwhip = false;
-			releasedwhip = (ATTACK_IS_DOWN && player->rings <= 0);
+			releasedwhip = (ATTACK_IS_DOWN && player->rings <= 0 && player->itemflags & IF_USERINGS);
 			player->instaWhipCharge = INSTAWHIP_CHARGETIME;
 			player->instaWhipCooldown = 0;
 		}