From ff667b7e45a92de0afe99a0563f845690b471cbf Mon Sep 17 00:00:00 2001 From: Sryder13 Date: Fri, 17 Nov 2017 22:40:24 +0000 Subject: [PATCH] Fix the items hitting people you bump bug --- src/p_mobj.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/p_mobj.c b/src/p_mobj.c index aa2d0ff3..6955677e 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -6582,9 +6582,11 @@ void P_MobjThinker(mobj_t *mobj) z = mobj->target->z + mobj->target->height - mobj->height; } + mobj->flags |= MF_NOCLIPTHING; // temporarily make them noclip other objects so they can't hit anyone while in the player P_TeleportMove(mobj, mobj->target->x, mobj->target->y, z); mobj->momx = FixedMul(FINECOSINE(mobj->angle>>ANGLETOFINESHIFT),radius); mobj->momy = FixedMul(FINESINE(mobj->angle>>ANGLETOFINESHIFT), radius); + mobj->flags &= ~MF_NOCLIPTHING; if (!P_TryMove(mobj, mobj->target->x + mobj->momx, mobj->target->y + mobj->momy, true)) P_SlideMove(mobj, true); if (P_IsObjectOnGround(mobj->target))