From 34e322b7a1dd8578c4e568a91bc071530fed1c93 Mon Sep 17 00:00:00 2001 From: James R Date: Sun, 12 Mar 2023 20:55:07 -0700 Subject: [PATCH] Ignore non-combo damage during hitlag Fixes stumble deadlock --- src/p_inter.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/p_inter.c b/src/p_inter.c index 7d558c882..f7b3baa00 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -2265,6 +2265,11 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da allowcombo = false; } + if (allowcombo == false && (target->eflags & MFE_PAUSED)) + { + return false; + } + // DMG_EXPLODE excluded from flashtic checks to prevent dodging eggbox/SPB with weak spinout if ((target->hitlag == 0 || allowcombo == false) && player->flashing > 0 && type != DMG_EXPLODE && type != DMG_STUMBLE) {