From e7d28a753692c2c5515497bac987dea9ac5531e7 Mon Sep 17 00:00:00 2001 From: Ashnal Date: Sun, 14 Sep 2025 11:56:39 -0400 Subject: [PATCH] When markedfordeath phase through objects Unless its funny --- src/p_map.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/p_map.c b/src/p_map.c index 580f0438e..36eb9e109 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -651,6 +651,12 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing) return BMIT_CONTINUE; // force no collide } + if (g_tm.thing->player && g_tm.thing->player->markedfordeath && (K_IsMissileOrKartItem(thing) || thing->type == MT_INSTAWHIP)) + return BMIT_CONTINUE; + + if (thing->player && thing->player->markedfordeath && (K_IsMissileOrKartItem(g_tm.thing) || g_tm.thing->type == MT_INSTAWHIP)) + return BMIT_CONTINUE; + // Blend-Eye internal noclip if ((thing->type == MT_BLENDEYE_GLASS || thing->type == MT_BLENDEYE_SHIELD || thing->type == MT_BLENDEYE_EGGBEATER) && (g_tm.thing->type == MT_BLENDEYE_MAIN || g_tm.thing->type == MT_BLENDEYE_EYE || g_tm.thing->type == MT_BLENDEYE_PUYO))