From 754d822c85d7352454dc328d5c33def907311bde Mon Sep 17 00:00:00 2001 From: Blockyyy <88585273+Blockyyy@users.noreply.github.com> Date: Wed, 22 Apr 2026 03:33:30 +0200 Subject: [PATCH] fix lingering kick pvp interaction (#1202) --- src/game/interaction.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/interaction.c b/src/game/interaction.c index 599d6c65a..3f6e14eb6 100644 --- a/src/game/interaction.c +++ b/src/game/interaction.c @@ -1516,7 +1516,7 @@ u32 interact_player_pvp(struct MarioState* attacker, struct MarioState* victim) // see if it was an attack u32 interaction = determine_interaction(attacker, cVictim->marioObj); // Specfically override jump kicks to prevent low damage and low knockback kicks - if (attacker->action == ACT_JUMP_KICK) { interaction = INT_KICK; } + if (attacker->action == ACT_JUMP_KICK && attacker->flags & MARIO_KICKING) { interaction = INT_KICK; } // Allow rollouts to attack else if (PLAYER_IN_ROLLOUT_FLIP(attacker)) { interaction = INT_HIT_FROM_BELOW; } if (!(interaction & INT_ANY_ATTACK) || (interaction & INT_HIT_FROM_ABOVE) || !passes_pvp_interaction_checks(attacker, cVictim)) {