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

merge upstream

Browse Source
This commit is contained in:
Ben Kerllenevich
2022-06-09 07:12:26 -04:00
parent 9ab5b07c78
commit 4b168c7792
41 changed files with 253 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0064-Add-5-second-tps-average-in-tps.patch
View File

@@ -27,18 +27,18 @@ 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 2603e73b86c87125cd3f1804463281324a75105a..2d179faa807ad78b8f7db0cf79cea0f3b94bb232 100644
index 9dc2dd5bc5894ff33826613f2fae28d51085b751..5a51ec9a9cba605b2fc32e51dcd78f0cbb253628 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -288,7 +288,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -287,7 +287,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
public static final int TPS = 20;
public static final int TICK_TIME = 1000000000 / MinecraftServer.TPS;
private static final int SAMPLE_INTERVAL = 20; // Paper
- public final double[] recentTps = new double[ 3 ];
+ public final double[] recentTps = new double[ 4 ]; // Purpur
// Spigot end
public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations;
public static long currentTickLong = 0L; // Paper
public boolean lagging = false; // Purpur
@@ -1069,6 +1069,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
private long lastTick = 0;
@@ -69,10 +69,10 @@ index 2603e73b86c87125cd3f1804463281324a75105a..2d179faa807ad78b8f7db0cf79cea0f3
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 5d9c85f9eb1625936e89c9cf1c95ad64d856e806..d46925742830089551c6541b53749f5aea288cbf 100644
index d7a1219efe8f95df1bbd50cab1aeaf7d80ad0e45..e0026d35131fa0b7029a9d23bda22bf27c234744 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2652,6 +2652,7 @@ public final class CraftServer implements Server {
@@ -2651,6 +2651,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {