mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 00:47:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: bfc807c2 Improve spawn loading and debug output for waiting on a chunk (#2595) 826b4762 Remove debug logging for incremental saves (#2600) d39916c7 Add more timings to chunk provider tick (#2549) 43ec79a3 Add server oversleep to timings (#2509) 1d2a5915 Check if there are workers before trying to notify them (#2593) 89eb8902 [CI-SKIP] Rebuild patches 27fca92f Drop Optimize-GameRules-to-use-LinkedHashMap (#2594) e4e80f8a Updated Upstream (Bukkit)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 2b5bdf675e9be4b6fc7f120d56d693e1fcfbdb70 Mon Sep 17 00:00:00 2001
|
||||
From 976e0f922370ffca7ef3a2403b677561f59a5c18 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,7 +10,7 @@ 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 dcb783407..427c1da00 100644
|
||||
index 1b6a9623c..ab596e74e 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
|
||||
@@ -21,7 +21,7 @@ index dcb783407..427c1da00 100644
|
||||
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
|
||||
// Spigot end
|
||||
|
||||
@@ -901,6 +902,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
||||
@@ -907,6 +908,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
||||
recentTps[0] = tps1.getAverage();
|
||||
recentTps[1] = tps5.getAverage();
|
||||
recentTps[2] = tps15.getAverage();
|
||||
|
||||
Reference in New Issue
Block a user