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

Preliminary update to 1.17.1

Browse Source
This commit is contained in:
William Blake Galbreath
2021-07-06 16:25:46 -05:00
parent 89c9c902b1
commit 471d6bf4c1
202 changed files with 994 additions and 20192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0015-Lagging-threshold.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0e0f7d48337f261481731917aabf45d8445121a0..34e364afff8cfe060244e5dd7cc0c34033dc6945 100644
index 53c4db48c184da5229c1de7ab5df447a248954da..ac78bea2e411324c10a0183b1c73ce542bdbd13d 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -309,6 +309,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -304,6 +304,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
public static final int TICK_TIME = 1000000000 / MinecraftServer.TPS;
private static final int SAMPLE_INTERVAL = 20; // Paper
public final double[] recentTps = new double[ 3 ];
@@ -16,16 +16,16 @@ index 0e0f7d48337f261481731917aabf45d8445121a0..34e364afff8cfe060244e5dd7cc0c340
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
// Spigot end
@@ -1235,6 +1236,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1170,6 +1171,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.recentTps[1] = tps5.getAverage();
this.recentTps[2] = tps15.getAverage();
// Paper end
+ lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
tickSection = curTime;
}
// Tuinity - replace logic
midTickChunksTasksRan = 0; // Paper
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 0982cfdbe748dbb7c41624efc770ed0cd1c798fa..2744735f6a15f6fd20c2b93b9c5c0422923bec01 100644
index b21554baf77e9ac1edf2e91ecaf1d5c089939e90..2697188c7e18cf5ae11e6e96a3dab95192470ac1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -179,6 +179,11 @@ public class PurpurConfig {
@@ -41,10 +41,10 @@ index 0982cfdbe748dbb7c41624efc770ed0cd1c798fa..2744735f6a15f6fd20c2b93b9c5c0422
public static boolean enderChestSixRows = false;
public static boolean enderChestPermissionRows = false;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b23d250c76236504e057f3a7e9e1d394a282812b..87cde1241a5ec525b8c1af127bf2e33c1dd87c4b 100644
index 2749eecddd51e8e4553fe7aaa4d01a9f6a6bf73b..e7ec300b3330cee49bb2fce76dc35f638a4f3b52 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2559,5 +2559,10 @@ public final class CraftServer implements Server {
@@ -2549,5 +2549,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return this.getProperties().serverName;
}