From 7853ac14cdb68589c9e4bf71d7a05020a08c8d2c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 17 Aug 2019 13:03:07 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appears to apply and compile correctly Paper Changes: eee1a019 Updated Upstream (CraftBukkit/Spigot) --- Paper | 2 +- current-paper | 2 +- patches/server/0051-Asynchronous-chunk-IO-and-loading.patch | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Paper b/Paper index c4ae0002e..eee1a019f 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit c4ae0002e1557ee4f73bc9c1cecee7110d652818 +Subproject commit eee1a019f9ad018e1b700ce564dfadf6c5ad487c diff --git a/current-paper b/current-paper index bd84005b0..8737119c1 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.14.4--3a747505b7af504d2e80e836bf8f1cfe810411c7 +1.14.4--b2e90788bff4a599b725842e53645df192494a41 diff --git a/patches/server/0051-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0051-Asynchronous-chunk-IO-and-loading.patch index da9301977..a573f6f31 100644 --- a/patches/server/0051-Asynchronous-chunk-IO-and-loading.patch +++ b/patches/server/0051-Asynchronous-chunk-IO-and-loading.patch @@ -1,4 +1,4 @@ -From 244cc8e22e8c2ad480abd369e3bcc041af550c28 Mon Sep 17 00:00:00 2001 +From fca313055ec431bdee7e3ece477c6a8934f590b3 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 13 Jul 2019 09:23:10 -0700 Subject: [PATCH] Asynchronous chunk IO and loading @@ -3706,7 +3706,7 @@ index 2969fcd55..0e23eeb1f 100644 public void doTick(BooleanSupplier booleansupplier) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 78e018caa..b8b1bf98c 100644 +index f59b2e49c..bc5b3fb5b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -551,22 +551,23 @@ public class CraftWorld implements World { @@ -3741,7 +3741,7 @@ index 78e018caa..b8b1bf98c 100644 // fall through to load // we do this so we do not re-read the chunk data on disk -@@ -2349,16 +2350,17 @@ public class CraftWorld implements World { +@@ -2350,16 +2351,17 @@ public class CraftWorld implements World { @Override public CompletableFuture getChunkAtAsync(int x, int z, boolean gen) {