diff --git a/Spigot-Server-Patches/0209-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0209-Add-PlayerJumpEvent.patch
index c6c02a34a2..d49ab3b66b 100644
--- a/Spigot-Server-Patches/0209-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0209-Add-PlayerJumpEvent.patch
@@ -1,4 +1,4 @@
-From eca509be2245fc905db63ffeae2ef13d4790525c Mon Sep 17 00:00:00 2001
+From bd89e2276d0e37b52f6a1cb3513780fc39db0f56 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Sep 2017 17:21:44 -0400
 Subject: [PATCH] Add PlayerJumpEvent
@@ -17,7 +17,7 @@ index 3ab03dd04..fcfc8299f 100644
          super.cH();
          this.a(StatisticList.JUMP);
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7e06e5bc6..4cf738e0f 100644
+index 5df7e4972..c9534f237 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -59,6 +59,8 @@ import org.bukkit.inventory.CraftingInventory;
@@ -29,7 +29,7 @@ index 7e06e5bc6..4cf738e0f 100644
  import co.aikar.timings.MinecraftTimings; // Paper
  // CraftBukkit end
  
-@@ -873,7 +875,34 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -874,7 +876,34 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                              d8 = d5 - this.p;
                              d9 = d6 - this.q;
                              if (this.player.onGround && !packetplayinflying.b() && d8 > 0.0D) {
diff --git a/Spigot-Server-Patches/0220-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0220-AsyncTabCompleteEvent.patch
index a78be388e5..30336c4e45 100644
--- a/Spigot-Server-Patches/0220-AsyncTabCompleteEvent.patch
+++ b/Spigot-Server-Patches/0220-AsyncTabCompleteEvent.patch
@@ -1,4 +1,4 @@
-From 1bf37ceccc4d3884c1ea59244e331eb003db6e68 Mon Sep 17 00:00:00 2001
+From f4e26df68e43f398b7a7d53f505fffe5e9b69922 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Nov 2017 13:19:58 -0500
 Subject: [PATCH] AsyncTabCompleteEvent
@@ -14,7 +14,7 @@ completion, such as offline players.
 Also adds isCommand and getLocation to the sync TabCompleteEvent
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 08f645de1c..b4e5d751e4 100644
+index 9188605f4..49709f723 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -10,6 +10,7 @@ import io.netty.util.concurrent.Future;
@@ -25,7 +25,7 @@ index 08f645de1c..b4e5d751e4 100644
  import java.util.Set;
  import java.util.function.Consumer;
  import javax.annotation.Nullable;
-@@ -506,10 +507,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -507,10 +508,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      }
  
      public void a(PacketPlayInTabComplete packetplayintabcomplete) {
@@ -38,7 +38,7 @@ index 08f645de1c..b4e5d751e4 100644
              return;
          }
          // CraftBukkit end
-@@ -519,11 +521,57 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -520,11 +522,57 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
              stringreader.skip();
          }
  
@@ -101,7 +101,7 @@ index 08f645de1c..b4e5d751e4 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0eea57eb7d..99f4b40f7f 100644
+index 0eea57eb7..99f4b40f7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1690,7 +1690,7 @@ public final class CraftServer implements Server {
@@ -114,7 +114,7 @@ index 0eea57eb7d..99f4b40f7f 100644
  
          return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions();
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 1e3aae3b8f..95d13c146b 100644
+index 1e3aae3b8..95d13c146 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -28,6 +28,39 @@ public class ConsoleCommandCompleter implements Completer {
diff --git a/Spigot-Server-Patches/0322-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0322-Break-up-and-make-tab-spam-limits-configurable.patch
index b8871fc372..8af4ddc817 100644
--- a/Spigot-Server-Patches/0322-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/Spigot-Server-Patches/0322-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -1,4 +1,4 @@
-From a5151ecd618a9fce62bccfc2b87a6de0f8654825 Mon Sep 17 00:00:00 2001
+From a84037ad0b92321b75bb1c58d6ecbca64f46b9da Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 29 Jul 2018 05:02:15 +0100
 Subject: [PATCH] Break up and make tab spam limits configurable
@@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
 plugins doing unsafe things.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index c457d07110..cc2e4ad3bd 100644
+index c457d0711..cc2e4ad3b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -327,4 +327,18 @@ public class PaperConfig {
@@ -45,7 +45,7 @@ index c457d07110..cc2e4ad3bd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0d58ea1c2b..906abc6541 100644
+index 2eba21ba7..eea30af78 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -78,6 +78,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -64,7 +64,7 @@ index 0d58ea1c2b..906abc6541 100644
          /* Use thread-safe field access instead
          if (this.chatThrottle > 0) {
              --this.chatThrottle;
-@@ -509,7 +511,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -510,7 +512,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      public void a(PacketPlayInTabComplete packetplayintabcomplete) {
          // PlayerConnectionUtils.ensureMainThread(packetplayintabcomplete, this, this.player.getWorldServer()); // Paper - run this async
          // CraftBukkit start
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 60d7982024..3037eb3e7c 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 60d7982024be4ae59e34d8a186be70fc350f52ae
+Subproject commit 3037eb3e7caa6941b343c31dc72255132ad78f50