diff --git a/Paper b/Paper index 4800d2da2..27731ddb3 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 4800d2da2a420a85f069569c00f4675b2dc6a548 +Subproject commit 27731ddb323a81282fbdb44abe656be707276389 diff --git a/current-paper b/current-paper index d9a2c634c..e2580df9f 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.14.1--bb68eb4235b2948bf90c1ae55fc64cf21b2c6626 +1.14.1--080b3cb3d97c27af3807d2b2baf3e621c44521eb diff --git a/patches/server/0019-Disable-TPS-Catchup.patch b/patches/server/0019-Disable-TPS-Catchup.patch deleted file mode 100644 index 282b454b5..000000000 --- a/patches/server/0019-Disable-TPS-Catchup.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 5a57aeeb543cc06d5ded97fa94bf0ad1915f0e16 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Tue, 21 May 2019 21:32:50 -0500 -Subject: [PATCH] Disable TPS Catchup - ---- - src/main/java/net/minecraft/server/MinecraftServer.java | 3 +++ - src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++ - 2 files changed, 8 insertions(+) - -diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d4df5bf57..97ea56a28 100644 ---- a/src/main/java/net/minecraft/server/MinecraftServer.java -+++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -47,6 +47,7 @@ import joptsimple.NonOptionArgumentSpec; - import joptsimple.OptionParser; - import joptsimple.OptionSet; - import joptsimple.OptionSpec; -+import net.pl3x.purpur.PurpurConfig; - import org.apache.commons.lang3.Validate; - import org.apache.logging.log4j.LogManager; - import org.apache.logging.log4j.Logger; -@@ -854,6 +855,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 0) { - if (catchupTime < 2E6) { -@@ -873,6 +875,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant