From fbccc955c97ee9a15eb55784fadb8a961094f6fc Mon Sep 17 00:00:00 2001 From: NepDisk Date: Mon, 19 May 2025 17:16:08 -0400 Subject: [PATCH] Only Drop rings if mobj2 is a player --- src/k_kart.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 978c135c6..7690445b2 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -2052,7 +2052,7 @@ boolean K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean sol mobj1->player->justbumped = bumptime; // Moved here so it only fires once on bump. - if ((mobj1->player->rings > 0) && (K_GetShieldFromPlayer(mobj1->player) == KSHIELD_NONE)) + if (mobj2->player && (mobj1->player->rings > 0) && (K_GetShieldFromPlayer(mobj1->player) == KSHIELD_NONE)) { P_PlayerRingBurst(mobj1->player, 1); } @@ -2072,7 +2072,7 @@ boolean K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean sol mobj2->player->justbumped = bumptime; // Moved here so it only fires once on bump. - if ((mobj2->player->rings > 0) && (K_GetShieldFromPlayer(mobj2->player) == KSHIELD_NONE)) + if (mobj1->player && (mobj2->player->rings > 0) && (K_GetShieldFromPlayer(mobj2->player) == KSHIELD_NONE)) { P_PlayerRingBurst(mobj2->player, 1); }