diff --git a/Spigot-Server-Patches/0435-Async-command-map-building.patch b/Spigot-Server-Patches/0435-Async-command-map-building.patch
index 463fac0fc7..303aa637e9 100644
--- a/Spigot-Server-Patches/0435-Async-command-map-building.patch
+++ b/Spigot-Server-Patches/0435-Async-command-map-building.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Async command map building
 
 
 diff --git a/src/main/java/net/minecraft/commands/CommandDispatcher.java b/src/main/java/net/minecraft/commands/CommandDispatcher.java
-index ddbd4c43bbe6d6a5b90f4958c4be80520a40beab..c97424b401147be53ffa7e2a2a3271d696752efe 100644
+index 63948c78205730d4aa6a6cc418f4f9de30401beb..592b1bb2ce5cedb627f42c73ef072ade6553347e 100644
 --- a/src/main/java/net/minecraft/commands/CommandDispatcher.java
 +++ b/src/main/java/net/minecraft/commands/CommandDispatcher.java
 @@ -29,6 +29,7 @@ import net.minecraft.network.chat.ChatHoverable;
@@ -16,7 +16,7 @@ index ddbd4c43bbe6d6a5b90f4958c4be80520a40beab..c97424b401147be53ffa7e2a2a3271d6
  import net.minecraft.server.commands.CommandAdvancement;
  import net.minecraft.server.commands.CommandAttribute;
  import net.minecraft.server.commands.CommandBan;
-@@ -327,6 +328,14 @@ public class CommandDispatcher {
+@@ -328,6 +329,14 @@ public class CommandDispatcher {
          if ( org.spigotmc.SpigotConfig.tabComplete < 0 ) return; // Spigot
          // CraftBukkit start
          // Register Vanilla commands into builtRoot as before
@@ -31,7 +31,7 @@ index ddbd4c43bbe6d6a5b90f4958c4be80520a40beab..c97424b401147be53ffa7e2a2a3271d6
          Map<CommandNode<CommandListenerWrapper>, CommandNode<ICompletionProvider>> map = Maps.newIdentityHashMap(); // Use identity to prevent aliasing issues
          RootCommandNode vanillaRoot = new RootCommandNode();
  
-@@ -344,7 +353,14 @@ public class CommandDispatcher {
+@@ -345,7 +354,14 @@ public class CommandDispatcher {
          for (CommandNode node : rootcommandnode.getChildren()) {
              bukkit.add(node.getName());
          }
diff --git a/Spigot-Server-Patches/0458-Implement-Brigadier-Mojang-API.patch b/Spigot-Server-Patches/0458-Implement-Brigadier-Mojang-API.patch
index 09d52a49dc..a9be98b326 100644
--- a/Spigot-Server-Patches/0458-Implement-Brigadier-Mojang-API.patch
+++ b/Spigot-Server-Patches/0458-Implement-Brigadier-Mojang-API.patch
@@ -10,10 +10,10 @@ Adds CommandRegisteredEvent
   - Allows manipulating the CommandNode to add more children/metadata for the client
 
 diff --git a/src/main/java/net/minecraft/commands/CommandDispatcher.java b/src/main/java/net/minecraft/commands/CommandDispatcher.java
-index c97424b401147be53ffa7e2a2a3271d696752efe..07d3dec9f613013aac72f3f5db17089ebe5ee770 100644
+index 592b1bb2ce5cedb627f42c73ef072ade6553347e..a13c684e1360169993f323aa4aa91078c5e8b031 100644
 --- a/src/main/java/net/minecraft/commands/CommandDispatcher.java
 +++ b/src/main/java/net/minecraft/commands/CommandDispatcher.java
-@@ -354,6 +354,7 @@ public class CommandDispatcher {
+@@ -355,6 +355,7 @@ public class CommandDispatcher {
              bukkit.add(node.getName());
          }
          // Paper start - Async command map building
@@ -21,7 +21,7 @@ index c97424b401147be53ffa7e2a2a3271d696752efe..07d3dec9f613013aac72f3f5db17089e
          MinecraftServer.getServer().execute(() -> {
             runSync(entityplayer, bukkit, rootcommandnode);
          });
-@@ -361,6 +362,7 @@ public class CommandDispatcher {
+@@ -362,6 +363,7 @@ public class CommandDispatcher {
  
      private void runSync(EntityPlayer entityplayer, Collection<String> bukkit, RootCommandNode<ICompletionProvider> rootcommandnode) {
          // Paper end - Async command map building
diff --git a/Spigot-Server-Patches/0701-Enhance-console-tab-completions-for-brigadier-comman.patch b/Spigot-Server-Patches/0701-Enhance-console-tab-completions-for-brigadier-comman.patch
index 5636a8b6e4..9b4a89bc49 100644
--- a/Spigot-Server-Patches/0701-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/Spigot-Server-Patches/0701-Enhance-console-tab-completions-for-brigadier-comman.patch
@@ -215,10 +215,10 @@ index 0000000000000000000000000000000000000000..d51d20a6d1c0c956cdf425503a6c1401
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/commands/CommandDispatcher.java b/src/main/java/net/minecraft/commands/CommandDispatcher.java
-index a70e0761aeddee8fafff971b5cbd0422ab560fb5..988d1c9e9f4f29325043eb083123d12dd5f8081d 100644
+index 978d3b79b5f953e67263598dff09bcb40b6e3f31..47dc8450fff5583d70c969c0b92b96a665a02305 100644
 --- a/src/main/java/net/minecraft/commands/CommandDispatcher.java
 +++ b/src/main/java/net/minecraft/commands/CommandDispatcher.java
-@@ -439,7 +439,7 @@ public class CommandDispatcher {
+@@ -440,7 +440,7 @@ public class CommandDispatcher {
          };
      }
  
diff --git a/Spigot-Server-Patches/0721-Send-empty-commands-if-tab-completion-is-disabled.patch b/Spigot-Server-Patches/0721-Send-empty-commands-if-tab-completion-is-disabled.patch
index 818cc40fa3..2fefc38db3 100644
--- a/Spigot-Server-Patches/0721-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/Spigot-Server-Patches/0721-Send-empty-commands-if-tab-completion-is-disabled.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Send empty commands if tab completion is disabled
 
 
 diff --git a/src/main/java/net/minecraft/commands/CommandDispatcher.java b/src/main/java/net/minecraft/commands/CommandDispatcher.java
-index 988d1c9e9f4f29325043eb083123d12dd5f8081d..29a395e69aab9c50a45c5fd5ab8795fd8e3ef727 100644
+index 47dc8450fff5583d70c969c0b92b96a665a02305..7e30ec9a08d919d2ae9218ee0a11f77719129f07 100644
 --- a/src/main/java/net/minecraft/commands/CommandDispatcher.java
 +++ b/src/main/java/net/minecraft/commands/CommandDispatcher.java
-@@ -326,7 +326,12 @@ public class CommandDispatcher {
+@@ -327,7 +327,12 @@ public class CommandDispatcher {
      }
  
      public void a(EntityPlayer entityplayer) {
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 5b0e2d2d60..1e8c432cd9 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 5b0e2d2d60fef96b2a0b2c4fb39a58489ecb7596
+Subproject commit 1e8c432cd90ffdd0300c7f73487649bae4c0aac8