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:
a55617d9ce Fix/improve the last upstream update (#6780)
72a3175165 Updated Upstream (Bukkit/CraftBukkit) (#6791)
eaee7a2473 Use correct LevelStem registry when loading default end/nether (#6789)
This commit is contained in:
William Blake Galbreath
2021-10-17 20:22:22 -05:00
parent db65efba2b
commit 2df73e0ed8
10 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,7 @@ index fa56cd09102a89692b42f1d14257990508c5c720..f9251183df72ddc56662fd3f02acf216
setListData(vector);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 761f09ee70cc7c9eaeceead97b787badbf6dca2f..c4d33daf24df7c5955f282da312a2c9384de1ff4 100644
index efa6043ebec5655b4a0a0e6d96bc07b75aca461a..05d3cabf2ea49b378d9a2189fa7168fab9968f2a 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -305,7 +305,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -39,7 +39,7 @@ index 761f09ee70cc7c9eaeceead97b787badbf6dca2f..c4d33daf24df7c5955f282da312a2c93
public boolean lagging = false; // Purpur
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
// Spigot end
@@ -1160,6 +1160,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1165,6 +1165,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
private long lastTick = 0;
private long catchupTime = 0;
@@ -47,7 +47,7 @@ index 761f09ee70cc7c9eaeceead97b787badbf6dca2f..c4d33daf24df7c5955f282da312a2c93
public final RollingAverage tps1 = new RollingAverage(60);
public final RollingAverage tps5 = new RollingAverage(60 * 5);
public final RollingAverage tps15 = new RollingAverage(60 * 15);
@@ -1250,13 +1251,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1255,13 +1256,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
{
final long diff = curTime - tickSection;
java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);