From bf976a7bcacb13ee876afbbb7377eaa4ea354a05 Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Tue, 31 May 2022 17:04:41 -0500 Subject: [PATCH] Make SPB match its target's hitlag --- src/p_enemy.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/p_enemy.c b/src/p_enemy.c index c4e8bceb4..724cb8f39 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -13607,6 +13607,12 @@ void A_SPBChase(mobj_t *actor) actor->lastlook = actor->tracer->player-players; // Save the player num for death scumming... actor->tracer->player->pflags |= PF_RINGLOCK; // set ring lock + if (actor->tracer->hitlag) + { + // If the player is frozen through no fault of their own, the SPB should be too. + actor->hitlag = actor->tracer->hitlag; + } + if (!P_IsObjectOnGround(actor->tracer)) { // In the air you have no control; basically don't hit unless you make a near complete stop