Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@de04cbc Updated Upstream (Bukkit/CraftBukkit) (#10034)
This commit is contained in:
granny
2023-12-17 01:11:46 -08:00
parent 9e1216de50
commit eb3b67d5b2
30 changed files with 100 additions and 113 deletions

View File

@@ -69,10 +69,10 @@ index 0d4d62757e7b15767ec62f59e287ab3a94be8c03..6206d19c2861996699ced5eccfff8ee8
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 eb7af0a4082ed46b438069175470aa1108a21119..aa84152e8198dfeed0465877d38216f8892f55f7 100644
index 10e3a712305661eaf4a0d3b7f23c404c080d4458..19d2c4c6de4cd5130be06fb368cd12b9581984a1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2967,6 +2967,7 @@ public final class CraftServer implements Server {
@@ -2968,6 +2968,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {