Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2fa8efc Updated Upstream (Bukkit/CraftBukkit) (#9485)
PaperMC/Paper@508a295 Only erase allay memory on non-item targets (#9570)
PaperMC/Paper@31358d5 API for updating recipes on clients (#6463)
PaperMC/Paper@8fe8ca6 Add clickable version on version command (#9347)
PaperMC/Paper@d6d2b6f Only capture actual tree growth (#6464)
This commit is contained in:
granny
2023-08-05 20:40:50 -07:00
parent 22eb20c622
commit 0e36fd08b8
48 changed files with 175 additions and 175 deletions

View File

@@ -69,10 +69,10 @@ index 1b192ce469ace3379ae10cd64b25118a58627e75..977dd212701e981a92b6c72f31fdc590
lagging = recentTps[0] < org.purpurmc.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 8976113602277a64cd0049980701b6b7cbcc6b47..6ed43bd792f932a0a976f9402e70ddb1f2862b5d 100644
index 4f657ac60aa980fb00bc248ebb4e848d7a8d16d6..569040a852d0985d0af0c29643dae7eecf5fe9a3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2826,6 +2826,7 @@ public final class CraftServer implements Server {
@@ -2864,6 +2864,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {