From 304cf9e8ebd8d50b245b2585463bc6806e976aa2 Mon Sep 17 00:00:00 2001 From: MysterD Date: Sun, 2 Apr 2023 22:11:04 -0700 Subject: [PATCH] Made players invulnerable to PVP when ground pounding --- src/game/interaction.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/game/interaction.c b/src/game/interaction.c index 03d0950e8..609f7cef0 100644 --- a/src/game/interaction.c +++ b/src/game/interaction.c @@ -1348,11 +1348,12 @@ u8 passes_pvp_interaction_checks(struct MarioState* attacker, struct MarioState* || attacker->action == ACT_WALL_KICK_AIR || attacker->action == ACT_WATER_JUMP || attacker->action == ACT_STEEP_JUMP || attacker->action == ACT_HOLD_JUMP); u8 isVictimIntangible = (victim->action & ACT_FLAG_INTANGIBLE); + u8 isVictimGroundPounding = (victim->action == ACT_GROUND_POUND) && (victim->actionState != 0); if (victim->knockbackTimer > 0) { return false; } - return (!isInvulnerable && !isIgnoredAttack && !isAttackerInvulnerable && !isVictimIntangible); + return (!isInvulnerable && !isIgnoredAttack && !isAttackerInvulnerable && !isVictimIntangible && !isVictimGroundPounding); } u32 interact_player(struct MarioState* m, UNUSED u32 interactType, struct Object* o) {