Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@e6f8284 Updated Upstream (Bukkit/CraftBukkit) (#8270)
This commit is contained in:
BillyGalbreath
2022-08-09 08:39:25 -05:00
parent d7b3ae90ce
commit b1925ac31f
18 changed files with 56 additions and 79 deletions

View File

@@ -69,10 +69,10 @@ index 35bd4446652d291c77174c0aa366a9030d5b0bcc..f810ed88c9d1d092308cfde748d0b18b
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 2bc9c1c16ebac1d7d9fcc69497a8ce2c6cb0b4ce..e6e20420878cdbe68633bc75be77c288e94fcc43 100644
index 2369be0c9d8cd07c9c1a923736133e53c4b770a5..85bac0c88b981d6bfec0e36066779ee8c4ed0583 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2686,6 +2686,7 @@ public final class CraftServer implements Server {
@@ -2693,6 +2693,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {