Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
a4f066cc Fix method profiler inbalance introduced in a2a9ffe (#3132)
c65dcad3 Don't delay chunk unloads during entity ticking
bc17ce69 Delay unsafe actions until after entity ticking is done - Fixes #3114
5553e6b3 Disable Sync Events firing Async errors during shutdown
e12c51d9 Use better variable for isStopping() API
586ee2bb Remove patch for MC-111480, fixed in 1.14
09a94215 Remove streams from Mob AI System
bb5c294e Fix Disabling Asynchronous Chunks
089d8356 Implement Chunk Priority / Urgency System for World Gen
fce69af7 Use dedicated thread for main thread blocking chunk loads
588b62e4 Add tick times API and /mspt command (#3102)
11de41c7 Add API MinecraftServer#isStopping (#3129)
942ff3c2 My patches are under MIT (#3130)
This commit is contained in:
William Blake Galbreath
2020-04-12 03:45:54 -05:00
parent bf845ca9e4
commit 193c511fce
95 changed files with 275 additions and 665 deletions

View File

@@ -1,4 +1,4 @@
From b7f8049479b52ec5a7c0edb6fd48ae1fa12fb7ad Mon Sep 17 00:00:00 2001
From 748ec8f720ad952d784ed4e3931d4c9a9de1c17c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Tue, 18 Feb 2020 20:30:03 -0600
Subject: [PATCH] Purpur config files
@@ -50,10 +50,10 @@ index 93d5a3f97..5e7e10c8f 100644
JSONObject object = new JSONObject();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 80f9abdca..eaaf9a4e9 100644
index 9ceaac0e8..20fe14213 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1371,6 +1371,18 @@ public interface Server extends PluginMessageRecipient {
@@ -1386,6 +1386,18 @@ public interface Server extends PluginMessageRecipient {
}
// Paper end