diff --git a/patches/server/1039-fixup-MC-Utils.patch b/patches/server/1039-fixup-MC-Utils.patch
index 06f2a7898c..b3d1e1136d 100644
--- a/patches/server/1039-fixup-MC-Utils.patch
+++ b/patches/server/1039-fixup-MC-Utils.patch
@@ -1329,6 +1329,25 @@ index 6baa313b8201ed23193d7885c85606b0899ade3c..5aa74c00a61282830d82359eae2b114e
          }
          // Paper end - chunk system hooks
          if (!this.addEntityUuid(entity)) {
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+index b2eb8cf1de3b4b81587531bb4c0d4b512f5d5d5d..6dc3fc701d1e16a51d99f934ea3dc192363a6762 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+@@ -2466,11 +2466,11 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+             }
+         }
+ 
+-        ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority priority;
++        ca.spottedleaf.concurrentutil.util.Priority priority;
+         if (urgent) {
+-            priority = ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.HIGHER;
++            priority = ca.spottedleaf.concurrentutil.util.Priority.HIGHER;
+         } else {
+-            priority = ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.NORMAL;
++            priority = ca.spottedleaf.concurrentutil.util.Priority.NORMAL;
+         }
+ 
+         java.util.concurrent.CompletableFuture<Chunk> ret = new java.util.concurrent.CompletableFuture<>();
 diff --git a/src/main/resources/META-INF/services/ca.spottedleaf.moonrise.common.PlatformHooks b/src/main/resources/META-INF/services/ca.spottedleaf.moonrise.common.PlatformHooks
 new file mode 100644
 index 0000000000000000000000000000000000000000..e57c3ca79677b1dfe7cf3db36f0406de7ea5bd0a
diff --git a/patches/server/1043-Moonrise-optimisation-patches.patch b/patches/server/1043-Moonrise-optimisation-patches.patch
index 6c028f78a6..3f638ea9d1 100644
--- a/patches/server/1043-Moonrise-optimisation-patches.patch
+++ b/patches/server/1043-Moonrise-optimisation-patches.patch
@@ -9288,7 +9288,7 @@ index 0000000000000000000000000000000000000000..f3c453773e0413276935ca653b60bbe6
 +}
 diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/NewChunkHolder.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/NewChunkHolder.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..381631e405895ba3eede1cd2e1011c64aadbd662
+index 0000000000000000000000000000000000000000..eafa4e6d55cd0f9314ac0f2b96a7f48fbb5e1a4c
 --- /dev/null
 +++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/NewChunkHolder.java
 @@ -0,0 +1,1998 @@
@@ -10372,7 +10372,7 @@ index 0000000000000000000000000000000000000000..381631e405895ba3eede1cd2e1011c64
 +        }
 +
 +        // Don't really have a choice but to place this hook here
-+        PlatformHooks.get().onChunkHolderTicketChange(this.world, this, oldLevel, newLevel);
++        PlatformHooks.get().onChunkHolderTicketChange(this.world, this.vanillaChunkHolder, oldLevel, newLevel);
 +    }
 +
 +    static final int NEIGHBOUR_RADIUS = 2;
@@ -14055,7 +14055,7 @@ index 0000000000000000000000000000000000000000..4538ccfaea83d217ed85eaf16e82393c
 +}
 diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/task/ChunkLoadTask.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/task/ChunkLoadTask.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..e0a88615a8b6d58191f29b1ff1a26427f0a4c1a6
+index 0000000000000000000000000000000000000000..1440c9e2b106616884edcb20201113320817ed9f
 --- /dev/null
 +++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/task/ChunkLoadTask.java
 @@ -0,0 +1,494 @@
@@ -14401,7 +14401,7 @@ index 0000000000000000000000000000000000000000..e0a88615a8b6d58191f29b1ff1a26427
 +
 +            try {
 +                // run converters
-+                final CompoundTag converted = this.world.getChunkSource().chunkMap.upgradeChunkTag(data);
++                final CompoundTag converted = this.world.getChunkSource().chunkMap.upgradeChunkTag(data, new ChunkPos(this.chunkX, this.chunkZ)); // Paper
 +
 +                // unpack the data
 +                final SerializableChunkData chunkData = SerializableChunkData.parse(
@@ -36040,7 +36040,7 @@ index 8348ab336029848eab1cbe9b67b056abf1f5866f..a34e40e273a79a234c3d79b6ad360ce3
  
      // Paper start - Adventure
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b2eb8cf1de3b4b81587531bb4c0d4b512f5d5d5d..d4800a19d91562d6c55ac9bc5ed33a2c0de5a34f 100644
+index 6dc3fc701d1e16a51d99f934ea3dc192363a6762..2058671a77cac4cfa6494461a5142abae14402b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -508,10 +508,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {