rebase on latest paper

This commit is contained in:
Ben Kerllenevich
2021-11-25 06:58:21 -05:00
parent 108644cca2
commit 8503ea0b19
24 changed files with 140 additions and 140 deletions

View File

@@ -5,7 +5,7 @@ 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 6c7efdf64af09a9ec87338b313a10904a9afdda7..86f056cd797881a88593a1933a411200fb5ae154 100644
index 2ffc5d9c145cdf53baa8db260f03660a76db78c5..e6c6fe80e2fddceec4cd16b08cf7aab888c7fd9d 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
@@ -16,7 +16,7 @@ index 6c7efdf64af09a9ec87338b313a10904a9afdda7..86f056cd797881a88593a1933a411200
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
// Spigot end
public static long currentTickLong = 0L; // Paper
@@ -1169,6 +1170,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1250,6 +1251,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.recentTps[1] = tps5.getAverage();
this.recentTps[2] = tps15.getAverage();
// Paper end