From b0e76a699c1a1742a6bc20e7fd089d6c6e20f192 Mon Sep 17 00:00:00 2001
From: Agent X <44549182+AgentXLP@users.noreply.github.com>
Date: Mon, 8 Jul 2024 19:57:33 -0400
Subject: [PATCH] Fix players bouncing on non existent players when entering a
 level in an airborne action

---
 src/game/interaction.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/game/interaction.c b/src/game/interaction.c
index 803a9656..21c0a24b 100644
--- a/src/game/interaction.c
+++ b/src/game/interaction.c
@@ -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) {
+    // don't touch each other on level load
+    if (gCurrentArea == NULL || gCurrentArea->localAreaTimer < 60) {
+        return FALSE;
+    }
+
     if (!m || !o) { return FALSE; }
     if (!is_player_active(m)) { 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;
     }
 
-    // don't touch each other on level load
-    if (gCurrentArea == NULL || gCurrentArea->localAreaTimer < 60) {
-        return FALSE;
-    }
-
     return FALSE;
 }