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

Implement lagging threshold

Browse Source
This commit is contained in:
William Blake Galbreath
2019-07-23 10:10:10 -05:00
parent 1dd63e55ec
commit 637e5469a2
2 changed files with 115 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
patches/api/0017-Implement-lagging-threshold.patch Normal file
View File

@@ -0,0 +1,50 @@
From 605cb47bd65ebc8e0877113b2f76bb3cf6ef7b48 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 10:07:24 -0500
Subject: [PATCH] Implement lagging threshold
---
src/main/java/org/bukkit/Bukkit.java | 9 +++++++++
src/main/java/org/bukkit/Server.java | 7 +++++++
2 files changed, 16 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 352e13eef..f87b8c3d5 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1610,6 +1610,15 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
+
+ /**
+ * Check if server is lagging according to laggy threshold setting
+ *
+ * @return True if lagging
+ */
+ public static boolean isLagging() {
+ return server.isLagging();
+ }
// Purpur end
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 5337e3c5a..14da18751 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1407,5 +1407,12 @@ public interface Server extends PluginMessageRecipient {
*/
@NotNull
String getServerName();
+
+ /**
+ * Check if server is lagging according to laggy threshold setting
+ *
+ * @return True if lagging
+ */
+ boolean isLagging();
// Purpur end
}
--
2.20.1

65
patches/server/0061-Implement-lagging-threshold.patch Normal file
View File

@@ -0,0 +1,65 @@
From e8f673e15dac66aa35d517bfc81a83635e96d6a6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 10:07:16 -0500
Subject: [PATCH] Implement lagging threshold
---
src/main/java/net/minecraft/server/MinecraftServer.java | 2 ++
src/main/java/net/pl3x/purpur/PurpurConfig.java | 2 ++
src/main/java/org/bukkit/craftbukkit/CraftServer.java | 5 +++++
3 files changed, 9 insertions(+)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index c5e89790fc..bfd1a9a809 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -175,6 +175,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
public static final int TICK_TIME = 1000000000 / TPS;
private static final int SAMPLE_INTERVAL = 20; // Paper
public final double[] recentTps = new double[ 3 ];
+ public boolean lagging = false; // Purpur
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
// Spigot end
@@ -908,6 +909,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
recentTps[0] = tps1.getAverage();
recentTps[1] = tps5.getAverage();
recentTps[2] = tps15.getAverage();
+ lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
// Paper end
tickSection = curTime;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 4943f48efd..eeb98ed666 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -138,9 +138,11 @@ public class PurpurConfig {
public static boolean enableTickOverload = false;
public static boolean enableTPSCatchup = false;
+ public static double laggingThreshold = 19.0D;
private static void tickLoopSettings() {
enableTickOverload = getBoolean("settings.enable-tick-overload", enableTickOverload);
enableTPSCatchup = getBoolean("settings.enable-tps-catchup", enableTPSCatchup);
+ laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);
}
public static boolean disableDropsOnCrammingDeath = true;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3fdb4230d0..bd434258b0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2170,5 +2170,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return getProperties().serverName;
}
+
+ @Override
+ public boolean isLagging() {
+ return getServer().lagging;
+ }
// Purpur end
}
--
2.20.1