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

rebase

Browse Source
This commit is contained in:
Ben Kerllenevich
2021-12-03 11:51:10 -05:00
parent f40f91c273
commit ef024e1fcc
14 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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 a6b5a8ff4f72404b69cf08a485632db23967e801..358dcf61cd5f27c77709d175b15e84338858c739 100644
index 1cb6c989a0b21df7dff72062550daa09721d7687..4d89c9de4b4aae4452750fb941a2e610b8834039 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -303,6 +303,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,7 +16,7 @@ index a6b5a8ff4f72404b69cf08a485632db23967e801..358dcf61cd5f27c77709d175b15e8433
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
// Spigot end
public static long currentTickLong = 0L; // Paper
@@ -1246,6 +1247,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1247,6 +1248,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.recentTps[1] = tps5.getAverage();
this.recentTps[2] = tps15.getAverage();
// Paper end
@@ -25,10 +25,10 @@ index a6b5a8ff4f72404b69cf08a485632db23967e801..358dcf61cd5f27c77709d175b15e8433
}
// Spigot end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 94ab78c63e7b730a9a06eb0b50e80d50df73023c..a4533e553d199e041014446874a3b5c2f6901431 100644
index 6111fd7296e030c1f03137c98439b5cb6d2bddc3..bfa7be57dbfb31e4a3d53f3138dd9578fbdad617 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2725,5 +2725,10 @@ public final class CraftServer implements Server {
@@ -2722,5 +2722,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return this.getProperties().serverName;
}