thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix players bouncing on non existent players when entering a level in an airborne action

Browse source
This commit is contained in:
Agent X 2024-07-08 19:57:33 -04:00
parent e97ab5a31b
commit b0e76a699c
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/game/interaction.c
View file

@ -1372,6 +1372,11 @@ u8 passes_pvp_interaction_checks(struct MarioState* attacker, struct MarioState*
} }
u32 interact_player(struct MarioState* m, UNUSED u32 interactType, struct Object* o) { u32 interact_player(struct MarioState* m, UNUSED u32 interactType, struct Object* o) {
// don't touch each other on level load
if (gCurrentArea == NULL || gCurrentArea->localAreaTimer < 60) {
return FALSE;
}
if (!m || !o) { return FALSE; } if (!m || !o) { return FALSE; }
if (!is_player_active(m)) { return FALSE; } if (!is_player_active(m)) { return FALSE; }
if (gServerSettings.playerInteractions == PLAYER_INTERACTIONS_NONE) { return FALSE; } if (gServerSettings.playerInteractions == PLAYER_INTERACTIONS_NONE) { return FALSE; }
@ -1402,11 +1407,6 @@ u32 interact_player(struct MarioState* m, UNUSED u32 interactType, struct Object
return FALSE; return FALSE;
} }
// don't touch each other on level load
if (gCurrentArea == NULL || gCurrentArea->localAreaTimer < 60) {
return FALSE;
}
return FALSE; return FALSE;
} }