From a2dc5d66241625114207bd472fd80885e9c309bd Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Tue, 29 Sep 2020 18:05:37 -0700
Subject: [PATCH] Sanity check torsoPos to prevent phantom collisions

---
 src/game/object_list_processor.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/game/object_list_processor.c b/src/game/object_list_processor.c
index 7e91bd2c6..6b3b0afd7 100644
--- a/src/game/object_list_processor.c
+++ b/src/game/object_list_processor.c
@@ -271,6 +271,13 @@ void bhv_mario_update(void) {
     // set mario state to the current player
     gMarioState = &gMarioStates[gCurrentObject->oBehParams - 1];
 
+    // sanity check torsoPos, it isn't updated off-screen otherwise
+    Vec3f torsoDiff = { 0 };
+    vec3f_dif(torsoDiff, gMarioState->pos, gMarioState->marioBodyState->torsoPos);
+    if (vec3f_length(torsoDiff) > 300) {
+        vec3f_copy(gMarioState->marioBodyState->torsoPos, gMarioState->pos);
+    }
+
     u32 particleFlags = 0;
     s32 i;