diff --git a/Spigot-Server-Patches/Add-Location-support-to-tab-completers-vanilla-featu.patch b/Spigot-Server-Patches/Add-Location-support-to-tab-completers-vanilla-featu.patch
index 6f584d0687..1e91b304a0 100644
--- a/Spigot-Server-Patches/Add-Location-support-to-tab-completers-vanilla-featu.patch
+++ b/Spigot-Server-Patches/Add-Location-support-to-tab-completers-vanilla-featu.patch
@@ -71,14 +71,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          if (!(sender instanceof EntityPlayer)) {
              return ImmutableList.of();
          }
- 
+@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
+         List<String> offers;
          Player player = ((EntityPlayer) sender).getBukkitEntity();
          if (message.startsWith("/")) {
--            return tabCompleteCommand(player, message);
-+            return tabCompleteCommand(player, message, blockPosition);
+-            offers = tabCompleteCommand(player, message);
++            offers = tabCompleteCommand(player, message, blockPosition);
          } else {
-             return tabCompleteChat(player, message);
+             offers = tabCompleteChat(player, message);
          }
+@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
+         getPluginManager().callEvent(tabEvent);
+ 
+         return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions();
 +        // Paper end
      }
  
diff --git a/work/Bukkit b/work/Bukkit
index 329ef57aea..b276e93f56 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 329ef57aea4529ce36b9d59b22d2ce00d1c64cb0
+Subproject commit b276e93f56cc04aaa2011efa1fe16b839c611eb7
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 4e19de1295..d8637dfb7e 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 4e19de129580f7e2e9bf10734e09d3dbc3ca9722
+Subproject commit d8637dfb7e581c9745aa8f7f505b971c99720159
diff --git a/work/Spigot b/work/Spigot
index 4af49dc0ab..8a048fe4a4 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 4af49dc0abc0056b1f66f92a2ee107f9f1749a82
+Subproject commit 8a048fe4a4351b6a293cea7409a42332a31f17f5