Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper) (#787)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c1bd3cc Updated Upstream (CraftBukkit) (#7105)
PaperMC/Paper@df1301b Make org.bukkit.Keyed extend Adventure's Keyed (#7090)
PaperMC/Paper@d8747c1 [ci skip] Add nullable annotation to field (#7042)
PaperMC/Paper@7f31095 Add more Campfire API (#5779)
PaperMC/Paper@51d1687 Update log4j to 2.16.0
This commit is contained in:
Oharass
2021-12-14 13:59:40 -06:00
committed by GitHub
parent 45ae426761
commit b8261d92e6
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0066-Add-5-second-tps-average-in-tps.patch
View File

@@ -69,10 +69,10 @@ index 55067e47a9907f038bf77f5dda2f395773472ceb..70dfa4d3b7a2c9b2a47000bf26100f17
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 98f14ba75b0fed27effc5259eaf62c3fa372df26..d397daf9a6b2128735a0732565a41be9197742a4 100644
index cc0e2adaa6f857ad646b1a853faf7a979af9de7b..0f3c8b754d8c349125c1debb060c3e17364aba9b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2605,6 +2605,7 @@ public final class CraftServer implements Server {
@@ -2598,6 +2598,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {