Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +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:
aa022fda Fix java cross-version compilation
8b7952a9 Implement alternative item-despawn-rate (#2128)
6ccf0bda Reimplement hopper optimization patch (#2388)
e264c365 MC-156852 fix (#2396)
b6c32b2a Fix recursion in EntityFox (#2418)
7c640a1a Updated Upstream (Bukkit/CraftBukkit/Spigot)  (#2415)
This commit is contained in:
William Blake Galbreath
2019-08-08 18:01:13 -05:00
parent 3935d71fba
commit 2f16d3d43e
17 changed files with 87 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 7aed7be381bea2d92853d9bce1b5095eae5f2cf8 Mon Sep 17 00:00:00 2001
From d5e9cc74d18901973803a30ca23e71253fcf0960 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
@@ -2271,7 +2271,7 @@ index 000000000..03cb8e0b3
+
+}
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 2c6a164f0..64a899abc 100644
index 3894b0434..054affc7d 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -124,11 +124,137 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -2803,7 +2803,7 @@ index 23d1935dd..14f8b6104 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index e91f454c6..63e12399e 100644
index 443e0d627..c52295975 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -775,6 +775,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -3318,11 +3318,11 @@ index fd0d2b6e6..4c774e31d 100644
return this.n;
}
diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
index 41f1e15cb..3884dd84d 100644
index a8c8ace46..22144eb00 100644
--- a/src/main/java/net/minecraft/server/RegionFile.java
+++ b/src/main/java/net/minecraft/server/RegionFile.java
@@ -340,7 +340,7 @@ public class RegionFile implements AutoCloseable {
this.d[j] = i; // Paper - move this to after the write
@@ -343,7 +343,7 @@ public class RegionFile implements AutoCloseable {
this.d[j] = i; // Spigot - move this to after the write
}
- public void close() throws IOException {
@@ -3706,7 +3706,7 @@ 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 a2b6c3c94..69184f724 100644
index 21f153013..7fe8a5988 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 {