From 37cd05d23e1855c6fc104cb1a97473bdda06f854 Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Sat, 30 Dec 2023 22:12:22 -0700 Subject: [PATCH] Fix follower bubbles desyncing during hitlag --- src/k_follower.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/k_follower.c b/src/k_follower.c index 78e233e4c..c7ef5713b 100644 --- a/src/k_follower.c +++ b/src/k_follower.c @@ -586,10 +586,9 @@ void K_HandleFollower(player_t *player) while (bmobj != NULL && P_MobjWasRemoved(bmobj) == false) { // match follower's momentums and (e)flags(2). - bmobj->momx = player->follower->momx; - bmobj->momy = player->follower->momy; - bmobj->z += FixedDiv(deltaz, fl->vertlag); - bmobj->momz = player->follower->momz; + + // mom-set approach didn't play nice with hitlag, let's just warp it. + P_MoveOrigin(bmobj, player->follower->x, player->follower->y, player->follower->z); P_SetScale(bmobj, FixedMul(bubble, player->mo->scale)); K_GenericExtraFlagsNoZAdjust(bmobj, player->follower);