final fix

Exiled-Team · Apr 2, 2024 · a751ac8 · a751ac8
1 parent 67fe593
commit a751ac8
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/Exiled.Events/Patches/Events/Map/ElevatorMovingAndArrived.cs b/Exiled.Events/Patches/Events/Map/ElevatorMovingAndArrived.cs
@@ -35,7 +35,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             int index = newInstructions.FindIndex(x => x.Calls(PropertyGetter(typeof(NetworkServer), nameof(NetworkServer.active))));
 
-            Label returnLabel = generator.DefineLabel();
+            Label continueLabel = generator.DefineLabel();
 
             newInstructions.InsertRange(
                 index,
@@ -56,9 +56,14 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Call, Method(typeof(Handlers.Map), nameof(Handlers.Map.OnElevatorMoving))),
 
                     // if (!ev.IsAllowed)
-                    //    return;
+                    //    return false;
                     new(OpCodes.Callvirt, PropertyGetter(typeof(ElevatorMovingEventArgs), nameof(ElevatorMovingEventArgs.IsAllowed))),
-                    new(OpCodes.Brfalse_S, returnLabel),
+                    new(OpCodes.Brtrue_S, continueLabel),
+
+                    new(OpCodes.Ldc_I4_0),
+                    new(OpCodes.Ret),
+
+                    new CodeInstruction(OpCodes.Nop).WithLabels(continueLabel),
                 });
 
             int offset = 1;
@@ -79,8 +84,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Call, Method(typeof(Handlers.Map), nameof(Handlers.Map.OnElevatorArrived))),
                 });
 
-            newInstructions[newInstructions.Count - 1].labels.Add(returnLabel);
-
             for (int z = 0; z < newInstructions.Count; z++)
                 yield return newInstructions[z];