Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
3aae7ef Updated Upstream (Bukkit/CraftBukkit)
4713937 Fix return value of Block#applyBoneMeal always being false (#6030)
This commit is contained in:
William Blake Galbreath
2021-06-28 22:07:35 -05:00
parent 76845665e6
commit cd5f184f6d
12 changed files with 43 additions and 43 deletions

View File

@@ -69,10 +69,10 @@ index c5f1141d46acca284f5489d68d3b628e669950cb..9017d3626f4982a41d34d65758de4844
lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
tickSection = curTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0b32e9acdc95ad27a43f20863aebf40fb33df207..b0a7d903696f62360a0a0b4e1a9a50cc8e5cc027 100644
index 87cde1241a5ec525b8c1af127bf2e33c1dd87c4b..e6c77e7ecfa03f948423a68df0266210d0a0274d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2323,6 +2323,7 @@ public final class CraftServer implements Server {
@@ -2333,6 +2333,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {