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:
c4ae0002 Fix some API and commands usage of inactive chunks (#2457)
700a6649 Print entity debug stacktrace on entity double add (#2438)
9d6680ee Fix MC-158900 (#2458)
928abb41 [CI-SKIP] Rebuild patches for last merge
34e64781 Do less work if we have a custom Bukkit generator (#2318)
This commit is contained in:
William Blake Galbreath
2019-08-15 12:55:24 -05:00
parent e9d374a46c
commit 87eeb03354
6 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From d5e9cc74d18901973803a30ca23e71253fcf0960 Mon Sep 17 00:00:00 2001
From 244cc8e22e8c2ad480abd369e3bcc041af550c28 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
@@ -3602,7 +3602,7 @@ index b0e6ad773..f6c95ae8c 100644
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index e73257f3f..787dc3e88 100644
index 2969fcd55..0e23eeb1f 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1,9 +1,9 @@
@@ -3706,10 +3706,10 @@ index e73257f3f..787dc3e88 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 21f153013..7fe8a5988 100644
index 78e018caa..b8b1bf98c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -538,22 +538,23 @@ public class CraftWorld implements World {
@@ -551,22 +551,23 @@ public class CraftWorld implements World {
return true;
}
@@ -3741,7 +3741,7 @@ index 21f153013..7fe8a5988 100644
// fall through to load
// we do this so we do not re-read the chunk data on disk
@@ -2336,16 +2337,17 @@ public class CraftWorld implements World {
@@ -2349,16 +2350,17 @@ public class CraftWorld implements World {
@Override
public CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen) {
@@ -3769,5 +3769,5 @@ index 21f153013..7fe8a5988 100644
// Paper end
--
2.20.1
2.23.0.rc1