diff --git a/patches/unapplied/server/0745-Vanilla-command-permission-fixes.patch b/patches/server/0727-Vanilla-command-permission-fixes.patch
similarity index 93%
rename from patches/unapplied/server/0745-Vanilla-command-permission-fixes.patch
rename to patches/server/0727-Vanilla-command-permission-fixes.patch
index 46e803d4e5..9080cc3cca 100644
--- a/patches/unapplied/server/0745-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0727-Vanilla-command-permission-fixes.patch
@@ -30,10 +30,10 @@ index 899008b2980d13f1be6280cd8cb959c53a29bebf..f875507241ac6769545e91cd3285232b
      private RedirectModifier<S> modifier = null;
      private boolean forks;
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 816ea85a5880123c970d227d61426a0ae2b9539f..b7c24a7ff4dc50d03f74b21a0b353d0ce559b4d4 100644
+index 40a0fbc2049aeffef597f867383877cce9ea7a03..edc202d60ac3e8ac13b61d8c2c82d587567e9c05 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -204,6 +204,13 @@ public class Commands {
+@@ -211,6 +211,13 @@ public class Commands {
              PublishCommand.register(this.dispatcher);
          }
  
@@ -45,7 +45,7 @@ index 816ea85a5880123c970d227d61426a0ae2b9539f..b7c24a7ff4dc50d03f74b21a0b353d0c
 +        }
 +        // Paper end
          this.dispatcher.findAmbiguities((commandnode, commandnode1, commandnode2, collection) -> {
-             // CommandDispatcher.LOGGER.warn("Ambiguity between arguments {} and {} with inputs: {}", this.b.getPath(commandnode1), this.b.getPath(commandnode2), collection); // CraftBukkit
+             // CommandDispatcher.LOGGER.warn("Ambiguity between arguments {} and {} with inputs: {}", this.dispatcher.getPath(commandnode1), this.dispatcher.getPath(commandnode2), collection); // CraftBukkit
          });
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
 index 0377c706c9aec6f367e83f859f9a3432ad5bba4a..e9d1fb479855194da5a05e86861848158736cbb4 100644
diff --git a/patches/unapplied/server/0746-Make-CallbackExecutor-strict-again.patch b/patches/server/0728-Make-CallbackExecutor-strict-again.patch
similarity index 93%
rename from patches/unapplied/server/0746-Make-CallbackExecutor-strict-again.patch
rename to patches/server/0728-Make-CallbackExecutor-strict-again.patch
index 92205e8c6d..2567f71225 100644
--- a/patches/unapplied/server/0746-Make-CallbackExecutor-strict-again.patch
+++ b/patches/server/0728-Make-CallbackExecutor-strict-again.patch
@@ -10,10 +10,10 @@ schedules. Effectively, use the callback executor as a tool of
 finding issues rather than hiding these issues.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 047f1772c8f9346ba4541d46af8e144141865cfb..173c9d06b28db3e776c762903a0409234c08b13c 100644
+index e8b68702d7f720ba9d2985984547d0dda9541d41..825ed5ff5ee9fe4484dc81d1b5086d96813050e1 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -154,17 +154,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -156,17 +156,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      public final CallbackExecutor callbackExecutor = new CallbackExecutor();
      public static final class CallbackExecutor implements java.util.concurrent.Executor, Runnable {
  
diff --git a/patches/unapplied/server/0749-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0729-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
similarity index 87%
rename from patches/unapplied/server/0749-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
rename to patches/server/0729-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
index 834f48a1c9..e3da8f5c80 100644
--- a/patches/unapplied/server/0749-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
+++ b/patches/server/0729-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
@@ -10,10 +10,10 @@ to be unloaded will simply be unloaded next tick, rather than
 immediately.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index e88cae362fa167252aaa785895e378caec6ad757..b5c8f3f57d09de4caffeb9f3e20e9bf4daba1cdd 100644
+index f716fea06702f21f1aaf0aefcc5b3ea170d2013d..3c95e322a2ecf4fc212e168c4aa475d2e4e7ce69 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -909,6 +909,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -842,6 +842,7 @@ public class ServerChunkCache extends ChunkSource {
  
      // CraftBukkit start - modelled on below
      public void purgeUnload() {