From fbb7335011ef4ff8d6a40096889b3f66f22f0a4a Mon Sep 17 00:00:00 2001 From: NepDisk Date: Fri, 7 Mar 2025 17:30:53 -0500 Subject: [PATCH] Revert "Fix Bubble Shield duplicate collisions" This doesn't really apply to us since we don't have hitlag and it causes problems. This reverts commit b048467aa2aa814d95ac4ae6b4d7bb670a4313ed. --- src/k_collide.c | 13 +------------ src/p_mobj.c | 2 -- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/k_collide.c b/src/k_collide.c index 0472273d8..ef0e931d3 100644 --- a/src/k_collide.c +++ b/src/k_collide.c @@ -717,17 +717,6 @@ void K_ThunderShieldAttack(mobj_t *actor, fixed_t size) boolean K_BubbleShieldCollide(mobj_t *t1, mobj_t *t2) { - if (t1->type == MT_PLAYER) - { - // Bubble Shield already has a hitbox, and it gets - // teleported every tic so the Bubble itself will - // always make contact with other objects. - // - // Therefore, we don't need a second, smaller hitbox - // on the player. - return true; - } - if (t2->type == MT_PLAYER) { // Counter desyncs @@ -745,7 +734,7 @@ boolean K_BubbleShieldCollide(mobj_t *t1, mobj_t *t2) return true; // Player Damage - P_DamageMobj(t2, t1->target, t1, 1, DMG_NORMAL); + P_DamageMobj(t2, ((t1->type == MT_BUBBLESHIELD) ? t1->target : t1), t1, 1, DMG_NORMAL); if (t1->target->player) { diff --git a/src/p_mobj.c b/src/p_mobj.c index b7963dc94..ef02fc917 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -7410,9 +7410,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj) mobj->extravalue2 = mobj->target->player->bubbleblowup; P_SetScale(mobj, (mobj->destscale = scale)); - mobj->flags &= ~(MF_NOCLIPTHING); P_MoveOrigin(mobj, mobj->target->x, mobj->target->y, mobj->target->z); - mobj->flags |= MF_NOCLIPTHING; break; } case MT_FLAMESHIELD: