From 8c212a194cf5a8f8061e386327aed35e5087f42a Mon Sep 17 00:00:00 2001 From: Antonio Martinez Date: Fri, 12 Sep 2025 06:37:53 -0400 Subject: [PATCH] Don't try to soften removed/null traps --- src/k_kart.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 3040083b6..b98866a66 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -7498,9 +7498,12 @@ mobj_t *K_ThrowKartItemEx(player_t *player, boolean missile, mobjtype_t mapthing } // Missiles set as traps inflict a nocollide stumble - if (dir < 0 && (mapthing == MT_ORBINAUT || mapthing == MT_ORBINAUT_SHIELD || mapthing == MT_JAWZ || mapthing == MT_JAWZ_SHIELD || mapthing == MT_GACHABOM)) + if (mo && !P_MobjWasRemoved(mo)) { - mo->cvmem = 1; + if (dir < 0 && (mapthing == MT_ORBINAUT || mapthing == MT_ORBINAUT_SHIELD || mapthing == MT_JAWZ || mapthing == MT_JAWZ_SHIELD || mapthing == MT_GACHABOM)) + { + mo->cvmem = 1; + } } return mo;