From a7e6ed7607e462e8cabeab820bc13060d58ee86a Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Tue, 14 Nov 2023 20:33:33 -0800
Subject: [PATCH] K_PopPlayerShield: do not destroy Garden Top before it is
 deployed

---
 src/k_kart.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index cc6137a2b..79d214388 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -6414,7 +6414,10 @@ void K_PopPlayerShield(player_t *player)
 			return;
 
 		case KSHIELD_TOP:
-			Obj_GardenTopDestroy(player);
+			if (player->curshield == KSHIELD_TOP)
+			{
+				Obj_GardenTopDestroy(player);
+			}
 			return; // everything is handled by Obj_GardenTopDestroy
 
 		case KSHIELD_LIGHTNING: