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

Add /mspt command

Browse Source
This commit is contained in:
William Blake Galbreath
2020-03-13 20:14:23 -05:00
parent 76212761ee
commit c1846b3cb5
7 changed files with 212 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0053-Implement-lagging-threshold.patch
View File

@@ -1,4 +1,4 @@
From 10ce56cc3d93e77525baca1cca9803817f105a98 Mon Sep 17 00:00:00 2001
From 001bc8e16f69116a1854b1aa9998899694d4cb6b 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
@@ -10,10 +10,10 @@ Subject: [PATCH] Implement lagging threshold
3 files changed, 12 insertions(+)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index f2a8af48df..625227f078 100644
index 0889cef15d..2d7f1bae7a 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -178,6 +178,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -183,6 +183,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 ];
@@ -21,7 +21,7 @@ index f2a8af48df..625227f078 100644
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
// Spigot end
@@ -917,6 +918,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -922,6 +923,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
recentTps[1] = tps5.getAverage();
recentTps[2] = tps15.getAverage();
// Paper end
@@ -46,12 +46,12 @@ index e1a1ef860a..2537a5add3 100644
public static double packetRateLimitInterval = 10.0; // seconds
public static String packetRateLimitKickMessage = "Sent too many packets";
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ca31bb7ee8..dc48cdbd05 100644
index 32238d13b1..7104f58fb2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2249,5 +2249,10 @@ public final class CraftServer implements Server {
}
return ((double) total / (double) tickTimes.length) * 1.0E-6D;
@@ -2244,5 +2244,10 @@ public final class CraftServer implements Server {
public double getAverageTickTime() {
return getServer().tickTimes5s.getAverage();
}
+
+ @Override