diff --git a/Paper b/Paper index 27731ddb3..b3aa7dadc 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 27731ddb323a81282fbdb44abe656be707276389 +Subproject commit b3aa7dadcdaa90777689b7b1fb6655bb6dfd06a8 diff --git a/current-paper b/current-paper index e2580df9f..c9d9bd074 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.14.1--080b3cb3d97c27af3807d2b2baf3e621c44521eb +1.14.1--5a093e0a193c8c2c936a5d9769c62a318b7b9202 diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index d414d12c5..903305e3c 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -1,4 +1,4 @@ -From fe8f0a3e4e712232fa71d0296a24ce1a4c62f0e6 Mon Sep 17 00:00:00 2001 +From 1e655261f55aa2c8547e09d05bc7f5a910757ab2 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 01:02:11 -0500 Subject: [PATCH] Rebrand @@ -83,10 +83,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 f1cd38d42..d3316a6ac 100644 +index 184f1b00f..5bd0a4cc7 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1396,7 +1396,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 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 d3316a6ac..21ad507f9 100644 +index 5bd0a4cc7..67caf83e7 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -852,16 +852,21 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant