From fbd77ef6f7d2a93f4fa58b350ffdbe0416cb47cd Mon Sep 17 00:00:00 2001 From: James R Date: Tue, 30 Jan 2024 23:12:52 -0800 Subject: [PATCH] SPB: fix endless combo on players in its path --- src/p_inter.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/p_inter.c b/src/p_inter.c index f12cf1c65..a100cfba3 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -2859,6 +2859,14 @@ static boolean P_FlashingException(const player_t *player, const mobj_t *inflict return false; } + if (inflictor->type == MT_SPB) + { + // The SPB does not die on impact with players other than its intended target. + // Ignoring flashing tics would cause an endless combo on anyone who gets in way of the SPB. + // Upon hitting its target, DMG_EXPLODE will be used (which ignores flashing tics). + return false; + } + if (!P_IsKartItem(inflictor->type) && inflictor->type != MT_PLAYER) { // Exception only applies to player items.