diff --git a/Paper b/Paper
index 1bacdbd16..0d079188e 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 1bacdbd1694a47cbd3271a3c266a2b447645e45b
+Subproject commit 0d079188ea0f7edd2413e0de0410cac5bdd487d3
diff --git a/current-paper b/current-paper
index 20dff1030..7569ce0a3 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.14.3--8ee638466c371aafff0b09e2c6d949b1f3a3156b
+1.14.3--8a09ec0597392dd0a130182fb18bf9c6eeaa5ac2
diff --git a/patches/server/0036-Anti-Xray.patch b/patches/server/0036-Anti-Xray.patch
index 4b06678f3..015e3dce1 100644
--- a/patches/server/0036-Anti-Xray.patch
+++ b/patches/server/0036-Anti-Xray.patch
@@ -1,4 +1,4 @@
-From aded92344a7a557a303f95c9141040897596c767 Mon Sep 17 00:00:00 2001
+From e9a62a448db697a19aace112cddb3826e30729aa Mon Sep 17 00:00:00 2001
 From: stonar96 <minecraft.stonar96@gmail.com>
 Date: Mon, 20 Aug 2018 03:03:58 +0200
 Subject: [PATCH] Anti-Xray
@@ -49,7 +49,7 @@ index 81987e4ad..5942c3438 100644
      }
  
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 58109e130..b03d3ee84 100644
+index 4d3c6c6b4..929f5c303 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -1,7 +1,11 @@
@@ -64,7 +64,7 @@ index 58109e130..b03d3ee84 100644
  import org.bukkit.Bukkit;
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
-@@ -509,4 +513,43 @@ public class PaperWorldConfig {
+@@ -504,4 +508,43 @@ public class PaperWorldConfig {
      private void maxAutoSaveChunksPerTick() {
          maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
      }
@@ -1684,7 +1684,7 @@ index d2bf158a9..2eeae60d5 100644
      public static <T> TicketType<T> a(String s, Comparator<T> comparator) {
          return new TicketType<>(s, comparator, 0L);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index bd8c0b33e..2ff482d91 100644
+index c8f198fdf..c30d77be5 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2,6 +2,8 @@ package net.minecraft.server;