Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
eee1a019 Updated Upstream (CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2019-08-17 13:03:07 -05:00
parent dc53da5130
commit 7853ac14cd
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: c4ae0002e1...eee1a019f9

2
current-paper
View File

@@ -1 +1 @@
1.14.4--3a747505b7af504d2e80e836bf8f1cfe810411c7
1.14.4--b2e90788bff4a599b725842e53645df192494a41

6
patches/server/0051-Asynchronous-chunk-IO-and-loading.patch
View File

@@ -1,4 +1,4 @@
From 244cc8e22e8c2ad480abd369e3bcc041af550c28 Mon Sep 17 00:00:00 2001
From fca313055ec431bdee7e3ece477c6a8934f590b3 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
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<Chunk> getChunkAtAsync(int x, int z, boolean gen) {