From 28aaf0273491fc4bbcc3cf8db97ad4e8fc7dc608 Mon Sep 17 00:00:00 2001
From: Anonimus <anonimus.srb2k@gmail.com>
Date: Sun, 2 Nov 2025 01:39:23 -0400
Subject: [PATCH] Prevent the exploding barrel segfault

---
 src/k_collide.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/k_collide.c b/src/k_collide.c
index 9bbf3955d..1843c6426 100644
--- a/src/k_collide.c
+++ b/src/k_collide.c
@@ -679,7 +679,12 @@ boolean K_BubbleShieldCollide(mobj_t *t1, mobj_t *t2)
 		if (reflected)
 		{
 			// Drain my stuff please.
-			K_BubbleShieldCollideDrain(t1->target->player, t1, K_GetBubbleDamage(t2));
+			if ((!P_MobjWasRemoved(t1)) && (t1->target) && (t1->target->player))
+			{
+				K_BubbleShieldCollideDrain(t1->target->player,
+							   t1,
+							   K_GetBubbleDamage(t2));
+			}
 		}
 
 		return reflected;
@@ -692,7 +697,14 @@ boolean K_BubbleShieldCollide(mobj_t *t1, mobj_t *t2)
 		if (shootable)
 		{
 			// Drain my stuff please.
-			K_BubbleShieldCollideDrain(t1->target->player, t1, K_GetBubbleDamage(t2));
+
+			// FfffffFFFFUCKING EXPLODING BARRELS AAAAAA
+			if ((!P_MobjWasRemoved(t1)) && (t1->target) && (t1->target->player))
+			{
+				K_BubbleShieldCollideDrain(t1->target->player,
+							   t1,
+							   K_GetBubbleDamage(t2));
+			}
 		}
 
 		return shootable;