From 25712a0cf3f75efea0bc755cd86336c3d0104590 Mon Sep 17 00:00:00 2001
From: Lighto97 <lighto97@outlook.com>
Date: Wed, 12 Mar 2025 02:31:01 -0300
Subject: [PATCH] make game keep CR_TRAPBUBBLE flag on player respawn/reset

---
 src/p_inter.c | 3 ++-
 src/p_user.c  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/p_inter.c b/src/p_inter.c
index 1c696327a..2bad99e5d 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -2626,7 +2626,8 @@ static boolean P_KillPlayer(player_t *player, mobj_t *inflictor, mobj_t *source,
 	K_DropEmeraldsFromPlayer(player, player->emeralds);
 	//K_SetHitLagForObjects(player->mo, inflictor, source, MAXHITLAGTICS, true);
 
-	player->carry = CR_NONE;
+	if (player->carry != CR_TRAPBUBBLE)
+		player->carry = CR_NONE;
 
 	K_KartResetPlayerColor(player);
 
diff --git a/src/p_user.c b/src/p_user.c
index ecff343ee..0ba95a032 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -418,7 +418,8 @@ void P_ResetPlayer(player_t *player)
 {
 	//player->pflags &= ~(PF_);
 
-	player->carry = CR_NONE;
+	if (player->carry != CR_TRAPBUBBLE)
+		player->carry = CR_NONE;
 	player->onconveyor = 0;
 
 	//player->drift = player->driftcharge = 0;