diff --git a/Paper b/Paper
index 4be36f8d9..7a3054158 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 4be36f8d94215b5eb6175eb4d07909d16391bc5d
+Subproject commit 7a3054158d6033843f7f387979dd19db892624c1
diff --git a/current-paper b/current-paper
index 5acc73cb2..06714f258 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.14.2--afee8ff8f0da4607de225d2a0c526381e0e918a6
+1.14.2--63df7811c1c9ee6d5de4673e6b61828b501bbf65
diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch
index 55424c148..fb467ad60 100644
--- a/patches/server/0001-Rebrand.patch
+++ b/patches/server/0001-Rebrand.patch
@@ -1,4 +1,4 @@
-From c9b5349f033efc66b1241b6b3dcbef6aed95f767 Mon Sep 17 00:00:00 2001
+From b80fe4e5e4bfaf7ff2035a1ceff661d2a7e30867 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 01:02:11 -0500
 Subject: [PATCH] Rebrand
@@ -86,10 +86,10 @@ index cd6e25923..bb227bc0f 100644
          );
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 184f1b00f..5bd0a4cc7 100644
+index 3dbe83c7e..fc57f154f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1408,7 +1408,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1423,7 +1423,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
@@ -220,7 +220,7 @@ index 000000000..d8b408f06
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 59611846c..30bf80003 100644
+index 5884d92f8..9f78e8543 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -200,7 +200,7 @@ import javax.annotation.Nullable; // Paper
@@ -233,7 +233,7 @@ index 59611846c..30bf80003 100644
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 8d1288912..8df79c288 100644
+index ee5616cdf..b65c889ee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -279,7 +279,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0017-Tick-loop-config-options.patch b/patches/server/0017-Tick-loop-config-options.patch
index d90b3af96..699f6084d 100644
--- a/patches/server/0017-Tick-loop-config-options.patch
+++ b/patches/server/0017-Tick-loop-config-options.patch
@@ -1,4 +1,4 @@
-From 6c03ff30509c579923792c2f7a114a1dc9bffe7a Mon Sep 17 00:00:00 2001
+From 4bbc098121fe0157622312f0ae244fb124d1db4b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 22 May 2019 22:30:08 -0500
 Subject: [PATCH] Tick loop config options
@@ -9,10 +9,10 @@ Subject: [PATCH] Tick loop config options
  2 files changed, 28 insertions(+), 10 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5bd0a4cc7..67caf83e7 100644
+index fc57f154f..0a4d37cd4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -864,16 +864,21 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -865,16 +865,21 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                  long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
                  lastTick = start - TICK_TIME; // Paper
                  while (this.isRunning) {
@@ -43,7 +43,7 @@ index 5bd0a4cc7..67caf83e7 100644
  
                      if ( ++MinecraftServer.currentTick % SAMPLE_INTERVAL == 0 )
                      {
-@@ -904,7 +909,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -905,7 +910,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                      this.a(this::canSleepForTick);
                      this.methodProfiler.exitEnter("nextTickWait");
                      this.ac = true;