From abc79cab55656f15c8fa4da2370c6e01640e56b8 Mon Sep 17 00:00:00 2001
From: Agent X <44549182+AgentXLP@users.noreply.github.com>
Date: Fri, 27 Dec 2024 22:24:37 -0500
Subject: [PATCH] Change Mario OOB failsafe

---
 src/game/mario.c | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/game/mario.c b/src/game/mario.c
index 06049177f..b8420b430 100644
--- a/src/game/mario.c
+++ b/src/game/mario.c
@@ -1504,8 +1504,7 @@ void update_mario_joystick_inputs(struct MarioState *m) {
  */
 void update_mario_geometry_inputs(struct MarioState *m) {
     if (!m) { return; }
-    u8 copiedPlayer = FALSE;
-copyPlayerGoto:;
+resetGoto:;
 
     f32 gasLevel;
     f32 ceilToFloorDist;
@@ -1558,21 +1557,15 @@ copyPlayerGoto:;
         }
 
     } else {
-        if (!copiedPlayer) {
-            // try to prevent OOB by copying position of other player
-            struct Surface* floor2 = NULL;
-            for (s32 i = 0; i < MAX_PLAYERS; i++) {
-                struct MarioState* m2 = &gMarioStates[i];
-                if (m == m2) { continue; }
-                find_floor(m2->pos[0], m2->pos[1], m2->pos[2], &floor2);
-                if (floor2 == NULL) { continue; }
-                LOG_INFO("OOB! teleporting to player with local index %d", i);
-                vec3f_copy(m->pos, m2->pos);
-                copiedPlayer = TRUE;
-                goto copyPlayerGoto;
-            }
+        vec3f_set(m->pos, m->spawnInfo->startPos[0], m->spawnInfo->startPos[1], m->spawnInfo->startPos[2]);
+        m->faceAngle[1] = m->spawnInfo->startAngle[1];
+        struct Surface* floor = NULL;
+        find_floor(m->pos[0], m->pos[1], m->pos[2], &floor);
+        if (floor == NULL) {
+            level_trigger_warp(m, WARP_OP_DEATH);
+        } else {
+            goto resetGoto;
         }
-        level_trigger_warp(m, WARP_OP_DEATH);
     }
 }