thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-04-25 19:42:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix lingering kick pvp interaction (#1202)

Browse source
This commit is contained in:
Blockyyy 2026-04-22 03:33:30 +02:00 • committed by GitHub
parent 45bc3062be
commit 754d822c85
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/interaction.c
View file

@ -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)) {