Updated Upstream (Tuinity)

Upstream has released updates that appears to apply and compile correctly

    Tuinity Changes:
    8750b61 Fix entity count in timings and add water-ambient to per world spawn limits
    2d9c2c8 Improve concurrent UserCache access
This commit is contained in:
William Blake Galbreath
2020-07-11 10:45:04 -05:00
parent c4f05ee8cb
commit fb64f9a068
4 changed files with 197 additions and 101 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] World#getPlacementBlockData
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 0c721a5fd..a9dfd40f1 100644
index 94fad039f1..2577a41c92 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2620,5 +2620,10 @@ public class CraftWorld implements World {
@@ -2621,5 +2621,10 @@ public class CraftWorld implements World {
public net.pl3x.purpur.MoonPhase getMoonPhase() {
return net.pl3x.purpur.MoonPhase.getPhase(getFullTime() / 24000L);
}