Updated Upstream (Paper & Tuinity)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
6e7dc3f81 [Auto] Updated Upstream (CraftBukkit)
664ae4554 [Auto] Updated Upstream (CraftBukkit)
dafc7b8f8 Fix off by one error for scheduling block ticks (#4014)
5791e512b Fix MaterialTags tests to actually pass
115972651 Expand MaterialTags v2 (#4009)
5aaf1c514 prevent path space splitting in testServer.sh (#4007)
a8ef09b82 Tighten logic for handling target tick times in tick scheduler (#4010)
d5ccd4139 Remove ability to disable async chunks unless single core cpu
76728529f Fix Light Prioritization Issues
2d66b5be8 [Auto] Updated Upstream (CraftBukkit)
51d10c201 Add missing strikeLighting call to World#spigot()#strikeLightningEffect

Tuinity Changes:
416ed5e Fix 3 tick pistons not functioning correctly
489faf0 Fix up lock handling for UserCache
This commit is contained in:
William Blake Galbreath
2020-07-28 12:51:43 -05:00
parent 331571119c
commit fe05292d11
9 changed files with 84 additions and 81 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] MoonPhase API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 39decca9c5..94fad039f1 100644
index e8bbe1545e..f51f9c8d11 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2615,4 +2615,11 @@ public class CraftWorld implements World {
@@ -2616,4 +2616,11 @@ public class CraftWorld implements World {
return spigot;
}
// Spigot end