Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +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:
2780e94 Fix PaperTickList (#6241)
b854e7e Drop unneeded patch (#6240)
2961b2a Fix various mob drops being captured as death drops (#5675)
3801a39 Add ItemRarity test (#6247)
170382f Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6245)
This commit is contained in:
William Blake Galbreath
2021-07-23 10:55:13 -05:00
parent 0dad40ac19
commit dd259870b0
24 changed files with 172 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,10 +69,10 @@ index c96feac8afa0e0ea05513692d1e937ae7cbecd66..214b25f57f15e2127b92ec88117c36d4
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 cbf3817adb3c4a0dd818898f886d21e74d662a47..ef1004a277e4ae0bdec410c42271b4060227313f 100644
index 98ca2f530cb4df122168274d5676b3eb77117972..072532ca2c6868a29a019c4f79b44e4aaa02ffa7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2333,6 +2333,7 @@ public final class CraftServer implements Server {
@@ -2410,6 +2410,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {