stop LevelUpdate update chain after an error

EverestAPI · Aug 5, 2023 · 94c14e3 · 94c14e3
1 parent f2e41f7
commit 94c14e3
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/Celeste.Mod.mm/Patches/Level.cs b/Celeste.Mod.mm/Patches/Level.cs
@@ -502,10 +502,13 @@ private void FixChaserStatesTimeStamp() {
             }
         }
 
-        private void CheckForErrors() {
-            if (patch_LevelEnter.ErrorMessage != null) {
+        private bool CheckForErrors() {
+            bool errorPresent = patch_LevelEnter.ErrorMessage != null;
+            if (errorPresent) {
                 LevelEnter.Go(Session, false);
             }
+
+            return errorPresent;
         }
     }
 
@@ -704,6 +707,8 @@ public static void PatchLevelUpdate(ILContext context, CustomAttribute attrib) {
 
             // Insert CheckForErrors() at the beginning so we can display an error screen if needed
             cursor.Emit(OpCodes.Ldarg_0).Emit(OpCodes.Call, m_CheckForErrors);
+            // Insert an if statement that returns if we find an error at CheckForErrors
+            cursor.Emit(OpCodes.Brfalse, cursor.Next).Emit(OpCodes.Ret);
 
             // insert FixChaserStatesTimeStamp()
             cursor.Emit(OpCodes.Ldarg_0).Emit(OpCodes.Call, m_FixChaserStatesTimeStamp);