diff --git a/src/k_collide.c b/src/k_collide.c index d16d309ae..b32833b44 100644 --- a/src/k_collide.c +++ b/src/k_collide.c @@ -582,18 +582,7 @@ 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)) - { - P_DamageMobj(t2, t1, t1->target, 1, DMG_NORMAL); - K_BubbleShieldCollideDrain(t1->target->player, t1); - S_StartSound(t2, sfx_s3k44); - } - + // Ignore players. return true; } diff --git a/src/k_kart.c b/src/k_kart.c index ec200462d..32d1c757a 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -11581,18 +11581,13 @@ void K_MoveKartPlayer(player_t *player, boolean onground) if (player->bubbleblowup > bubbletime*2) { - player->itemamount--; - K_ThrowKartItem(player, (player->throwdir > 0), MT_BUBBLESHIELDTRAP, -1, 0); - K_PlayAttackTaunt(player->mo); - player->bubbleblowup = 0; - player->bubblecool = 0; - player->bubblepop = 0; - player->itemflags &= ~IF_HOLDREADY; - player->botvars.itemconfirm = 0; - } + // Jump straight to deflating the bubble. + goto bubbledeflate; + }z } else { +bubbledeflate: if (player->bubbleblowup > bubbletime) player->bubbleblowup = bubbletime;