diff --git a/patches/server/0119-Multithreaded-Tracker.patch b/patches/server/0119-Multithreaded-Tracker.patch
index 38d7848d9..2e65976b1 100644
--- a/patches/server/0119-Multithreaded-Tracker.patch
+++ b/patches/server/0119-Multithreaded-Tracker.patch
@@ -23,7 +23,7 @@ But it is still recommending to use those packet based, virtual entity
 based NPC plugins, e.g. ZNPC Plus, Adyeshach, Fancy NPC, etc.
 
 diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
-index e42677bb004201efe1702779a78cc8d0ca05e80f..3fa04bad6f5263c626c22ef0a795947391e1e710 100644
+index e42677bb004201efe1702779a78cc8d0ca05e80f..6676be8304e9415099ed423d3315180cafebd928 100644
 --- a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
 +++ b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
 @@ -42,6 +42,12 @@ class PaperEventManager {
@@ -31,7 +31,7 @@ index e42677bb004201efe1702779a78cc8d0ca05e80f..3fa04bad6f5263c626c22ef0a7959473
              throw new IllegalStateException(event.getEventName() + " may only be triggered asynchronously.");
          } else if (!event.isAsynchronous() && !this.server.isPrimaryThread() && !this.server.isStopping()) {
 +            // Leaf start - Multithreaded tracker
-+            if (org.dreeam.leaf.config.modules.async.MultithreadedTracker.enabled && Thread.currentThread() instanceof org.dreeam.leaf.async.tracker.MultithreadedTracker.MultithreadedTrackerThread) {
++            if (org.dreeam.leaf.config.modules.async.MultithreadedTracker.enabled) {
 +                net.minecraft.server.MinecraftServer.getServer().scheduleOnMain(event::callEvent);
 +                return;
 +            }
diff --git a/patches/server/0134-TT20-Lag-compensation.patch b/patches/server/0126-TT20-Lag-compensation.patch
similarity index 98%
rename from patches/server/0134-TT20-Lag-compensation.patch
rename to patches/server/0126-TT20-Lag-compensation.patch
index 9234aca00..44b3ea96e 100644
--- a/patches/server/0134-TT20-Lag-compensation.patch
+++ b/patches/server/0126-TT20-Lag-compensation.patch
@@ -7,7 +7,7 @@ This patch was ported from project: https://github.com/snackbag/TT20
 Project license: AGPL-3.0
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 09e55f62b4cea5b058e04356252f4f56957646b8..279289e0c3dc65fed0ee4b2f5b0ef077ab433d5e 100644
+index 37c377761b45eefab39164a7e714e585a02a4447..f268001f7a821ad1d0db8a02de19e80cc951d0fd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1628,6 +1628,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0126-Asynchronous-locator.patch b/patches/server/0127-Asynchronous-locator.patch
similarity index 99%
rename from patches/server/0126-Asynchronous-locator.patch
rename to patches/server/0127-Asynchronous-locator.patch
index bd83e631e..f1f0f5e72 100644
--- a/patches/server/0126-Asynchronous-locator.patch
+++ b/patches/server/0127-Asynchronous-locator.patch
@@ -19,7 +19,7 @@ index 11b7f15755dde766140c29bedca456c80d53293f..749d00449ac3f3c79bfc73a5517ea3a0
          this.id = id;
      }
 diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
-index 3fa04bad6f5263c626c22ef0a795947391e1e710..411bc27324c34e4cad1849512a4531214d7fe9d2 100644
+index 6676be8304e9415099ed423d3315180cafebd928..30b56382e9574004e344c1c8289d7dcbb177386b 100644
 --- a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
 +++ b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
 @@ -48,6 +48,12 @@ class PaperEventManager {
@@ -27,7 +27,7 @@ index 3fa04bad6f5263c626c22ef0a795947391e1e710..411bc27324c34e4cad1849512a453121
              }
              // Leaf end - Multithreaded tracker
 +            // Leaf start - Async locator
-+            if (org.dreeam.leaf.config.modules.async.AsyncLocator.enabled && Thread.currentThread() instanceof org.dreeam.leaf.async.locate.AsyncLocator.AsyncLocatorThread) {
++            if (org.dreeam.leaf.config.modules.async.AsyncLocator.enabled) {
 +                net.minecraft.server.MinecraftServer.getServer().scheduleOnMain(event::callEvent);
 +                return;
 +            }
diff --git a/patches/server/0127-Virtual-thread-for-chat-executor.patch b/patches/server/0128-Virtual-thread-for-chat-executor.patch
similarity index 94%
rename from patches/server/0127-Virtual-thread-for-chat-executor.patch
rename to patches/server/0128-Virtual-thread-for-chat-executor.patch
index 631ae0dd0..5bb5d294d 100644
--- a/patches/server/0127-Virtual-thread-for-chat-executor.patch
+++ b/patches/server/0128-Virtual-thread-for-chat-executor.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Virtual thread for chat executor
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 37c377761b45eefab39164a7e714e585a02a4447..09e55f62b4cea5b058e04356252f4f56957646b8 100644
+index f268001f7a821ad1d0db8a02de19e80cc951d0fd..279289e0c3dc65fed0ee4b2f5b0ef077ab433d5e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2894,7 +2894,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2900,7 +2900,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public final java.util.concurrent.ExecutorService chatExecutor = java.util.concurrent.Executors.newCachedThreadPool(
diff --git a/patches/server/0128-Use-QuickSort-in-NearestLivingEntitySensor.patch b/patches/server/0129-Use-QuickSort-in-NearestLivingEntitySensor.patch
similarity index 100%
rename from patches/server/0128-Use-QuickSort-in-NearestLivingEntitySensor.patch
rename to patches/server/0129-Use-QuickSort-in-NearestLivingEntitySensor.patch
diff --git a/patches/server/0129-Further-reduce-memory-footprint-of-CompoundTag.patch b/patches/server/0130-Further-reduce-memory-footprint-of-CompoundTag.patch
similarity index 100%
rename from patches/server/0129-Further-reduce-memory-footprint-of-CompoundTag.patch
rename to patches/server/0130-Further-reduce-memory-footprint-of-CompoundTag.patch
diff --git a/patches/server/0130-Optimize-Entity-distanceToSqr.patch b/patches/server/0131-Optimize-Entity-distanceToSqr.patch
similarity index 100%
rename from patches/server/0130-Optimize-Entity-distanceToSqr.patch
rename to patches/server/0131-Optimize-Entity-distanceToSqr.patch
diff --git a/patches/server/0131-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch b/patches/server/0132-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch
similarity index 100%
rename from patches/server/0131-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch
rename to patches/server/0132-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch
diff --git a/patches/server/0132-EMC-Default-don-t-use-blockstate-snapshots.patch b/patches/server/0133-EMC-Default-don-t-use-blockstate-snapshots.patch
similarity index 100%
rename from patches/server/0132-EMC-Default-don-t-use-blockstate-snapshots.patch
rename to patches/server/0133-EMC-Default-don-t-use-blockstate-snapshots.patch
diff --git a/patches/server/0133-Cache-tile-entity-position.patch b/patches/server/0134-Cache-tile-entity-position.patch
similarity index 100%
rename from patches/server/0133-Cache-tile-entity-position.patch
rename to patches/server/0134-Cache-tile-entity-position.patch