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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a76998d Fix plugin loggers on shutdown (#5592)
This commit is contained in:
BillyGalbreath
2022-08-22 15:55:20 -05:00
parent e599e96628
commit 868748e16f
17 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0016-Lagging-threshold.patch
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 48bf3a9938aae8d6cc847a80cf95cfda305414f5..0d57f093490e7db8d4d726111ba94e9edbceeda9 100644
index 28550587d7b3f3fd48b2ebaaafd8ed847a86082f..610f3ba3a983144b8b7f56e39d1c60bde6f35491 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -294,6 +294,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -16,7 +16,7 @@ index 48bf3a9938aae8d6cc847a80cf95cfda305414f5..0d57f093490e7db8d4d726111ba94e9e
public volatile Thread shutdownThread; // Paper
public volatile boolean abnormalExit = false; // Paper
@@ -1177,6 +1178,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1178,6 +1179,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.recentTps[1] = tps5.getAverage();
this.recentTps[2] = tps15.getAverage();
// Paper end
@@ -25,7 +25,7 @@ index 48bf3a9938aae8d6cc847a80cf95cfda305414f5..0d57f093490e7db8d4d726111ba94e9e
}
// Spigot end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0f441589561bff0d2f21bf1a1d764422a34ecbee..2369be0c9d8cd07c9c1a923736133e53c4b770a5 100644
index 7e66b58c607257ba4b7c047291b6bf115d5a200d..9bfd75df68a6cbad81cf933a448f5741d9d90b92 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2932,5 +2932,10 @@ public final class CraftServer implements Server {