Updated Upstream (Paper & Tuinity)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
55e2de5c6 Improve per player mob spawning (#3971)
42433c262 Updated Upstream (Bukkit/CraftBukkit) (#3980)
e5ede546a Fix IDE Debug JVM Flag for 1.16 (#3983)
2712c6888 [Auto] Updated Upstream (Bukkit/CraftBukkit)
0901ffd04 Use title packet for actionbar methods (#3959)
2e11235d1 Expand MaterialTags (#3964)
cc25ae47c Amend last commit to fix decompile error forgot to commit
f503db37c Fix AdvancementDataPlayer leak due from quitting early in login
282763b88 Fix SPIGOT-5885 Unable to disable advancements
9b93d122e Fix SPIGOT-5824 Bukkit world-container is not used
bede4d304 Load config files early on

Tuinity Changes:
b0673b3 Merge dev/optimise-notify into ver/1.16
d3dc35c Name craft scheduler threads according to the plugin using them
This commit is contained in:
William Blake Galbreath
2020-07-23 15:37:14 -05:00
parent 436d723076
commit 8bc19e524a
44 changed files with 772 additions and 435 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Tuinity API Changes
diff --git a/pom.xml b/pom.xml
index 15ce1c66462351d6d1ba55c111db13ef1c9f0789..63dfd1c647fd4d3b9b9924627d766c095d286f14 100644
index cb37aea9d..4004ff5d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,18 @@
@@ -34,10 +34,10 @@ index 15ce1c66462351d6d1ba55c111db13ef1c9f0789..63dfd1c647fd4d3b9b9924627d766c09
<properties>
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 0653e0ffe96748dc971ec7e8027f8159696adf62..65a40c4a9b24fa607d284e203becba034520b75d 100644
index 6e01bf2d5..46c4d98ce 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1438,6 +1438,14 @@ public interface Server extends PluginMessageRecipient {
@@ -1447,6 +1447,14 @@ public interface Server extends PluginMessageRecipient {
}
// Paper end