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 0fa0f29ff2114ab2c3d770bfb54ef050bb727e87 Mon Sep 17 00:00:00 2001
From 8cb6d31ea7c41a44a0f02f130c259613b7a384b5 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 10:07:24 -0500
Subject: [PATCH] Implement lagging threshold
@@ -9,10 +9,10 @@ Subject: [PATCH] Implement lagging threshold
2 files changed, 16 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index abf7caf0b..c9fc59a2e 100644
index ce82eadb5..013e3b2d1 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1675,6 +1675,15 @@ public final class Bukkit {
@@ -1703,6 +1703,15 @@ public final class Bukkit {
return server.getServerName();
}
@@ -29,10 +29,10 @@ index abf7caf0b..c9fc59a2e 100644
* Get a sample of the servers last tick times (in nanos)
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 89e9395e8..6f2e580ce 100644
index d2a3114eb..a185f2473 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1474,6 +1474,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1496,6 +1496,13 @@ public interface Server extends PluginMessageRecipient {
@NotNull
String getServerName();