Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@dd216c1 Fix Inconsistencies with Paper Plugin Names (#9098)
PaperMC/Paper@beed22d Undo making JavaPlugin#logger field public (#9125)
PaperMC/Paper@f7717c3 Fix server ignoring fallback for translatable components (#9134)
This commit is contained in:
granny
2023-04-20 19:26:41 -07:00
parent a495371bb7
commit 678eafef72
8 changed files with 19 additions and 19 deletions

View File

@@ -69,10 +69,10 @@ index ceaafede643bac0b6714df3d5475b4cb03b2eaed..65ba915d3644b638ce3b5314c0aed5b2
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 5a3b852b396367d32fa9de003dfdb1890a86beed..471a867b9734e6fb9735c17b06c1daf844657c50 100644
index 9c949e2e7d2d25f0012b3e7bc2e054cac42230a3..4df7b6ccb7d130f11d219ca4857604c753f3007c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2706,6 +2706,7 @@ public final class CraftServer implements Server {
@@ -2702,6 +2702,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {