From 1e47df835a480e60a4ecc628517d81dc1adce79b Mon Sep 17 00:00:00 2001 From: NepDisk Date: Fri, 21 Mar 2025 10:34:32 -0400 Subject: [PATCH] Don't waste bubble if it doesn't collide --- src/k_collide.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/k_collide.c b/src/k_collide.c index 591a22615..5709f587b 100644 --- a/src/k_collide.c +++ b/src/k_collide.c @@ -791,6 +791,10 @@ boolean K_BubbleShieldCollide(mobj_t *t1, mobj_t *t2) if (t2->type == MT_PLAYER) { + if (P_PlayerInPain(t2->player) + || t2->player->flashing || t2->player->hyudorotimer + || t2->player->justbumped || t2->scale > t1->scale + (mapobjectscale/8)) + return true; // Player Damage if (K_KartBouncing(t2, t1->target, false, true)) {