From efc415e53694edf2342e3fcb7a7b0c2da873d0b0 Mon Sep 17 00:00:00 2001 From: Latapostrophe Date: Mon, 11 Nov 2019 00:24:06 +0100 Subject: [PATCH] fix orbiting items not protecting you against your own items (cherry picked from commit 705851b38a5ab7cfbd810062cfb6b2dd921a6a1e) --- src/k_collide.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/k_collide.c b/src/k_collide.c index 128364cfc..a23801ccc 100644 --- a/src/k_collide.c +++ b/src/k_collide.c @@ -44,7 +44,7 @@ boolean K_OrbinautJawzCollide(mobj_t *t1, mobj_t *t2) if ((t1->threshold > 0 && t2->hitlag > 0) || (t2->threshold > 0 && t1->hitlag > 0)) return true; - if (((t1->target == t2) || (!(t2->flags & (MF_ENEMY|MF_BOSS)) && (t1->target == t2->target))) && (t1->threshold > 0 || (t2->type != MT_PLAYER && t2->threshold > 0))) + if (((t1->target == t2) || (!(t2->flags & (MF_ENEMY|MF_BOSS)) && (t1->target == t2->target))) && ((t1->threshold > 0 && t2->type == MT_PLAYER) || (t2->type != MT_PLAYER && t2->threshold > 0))) return true; if (t1->health <= 0 || t2->health <= 0)