From 148114ff54452559ea207e9dc8e941ae874c5264 Mon Sep 17 00:00:00 2001
From: NepDisk <nepdisk@noreply.codeberg.org>
Date: Wed, 30 Jul 2025 20:30:43 -0400
Subject: [PATCH] Fix shieldpopping being always active

---
 src/p_inter.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/p_inter.c b/src/p_inter.c
index 6b43e846a..c59d368fc 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -2370,12 +2370,11 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 			if (K_GetShieldFromPlayer(player) != KSHIELD_NONE)
 			{
 				ringburst = 0;
+				K_PopPlayerShield(player);
 			}
 
 			player->flashing = K_GetKartFlashing(player);
 
-			K_PopPlayerShield(player);
-
 			if (ringburst > 0)
 			{
 				P_PlayerRingBurst(player, ringburst);