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

Updated Upstream (Paper)

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

Paper Changes:
4276013833 Updated Upstream (Bukkit/CraftBukkit/Spigot)
5344798579 Clean plugin folder logic in extra-jars patch (Fixes #6347) (#6619)
3f2159e43c Unlimited chunk load rate (#6768)
fc0e6c7e08 Fix off by one for determining server view distance
0a16fb8182 Fix merchant inventories not closing on entity removal (#6544)
c1644521c9 Do not overload I/O threads with chunk data while flush saving
This commit is contained in:
William Blake Galbreath
2021-10-16 12:56:31 -05:00
parent e876536ae9
commit db65efba2b
13 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,10 +69,10 @@ index 761f09ee70cc7c9eaeceead97b787badbf6dca2f..c4d33daf24df7c5955f282da312a2c93
lagging = recentTps[0] < net.pl3x.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 9826257347888045b6f59d273c9c275653829d2b..64fa32a25e5e2d745d7605dfb1439f0e087dc304 100644
index 4dd23f5971c1e268e26bb7eeed9c592f8971c7e3..f38fe2e10dd6893dc4dbce9647d59e1f39e94d11 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2511,6 +2511,7 @@ public final class CraftServer implements Server {
@@ -2528,6 +2528,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {