Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +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@46a9d2a Cache Component MOTDs
This commit is contained in:
BillyGalbreath
2022-07-22 22:01:21 -05:00
parent a60a01188e
commit e65c695fc5
13 changed files with 75 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0017-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 afaf1d716a95f891056c5241b483309daa997c3d..f477d1c6c0a662dacc924977db1bbe528e4a31be 100644
index bf68f5632c374fe725f00de119f09fb703cf61fb..a37e28ebef82d4964899f1331b9a1b6d992b167f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -291,6 +291,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -292,6 +292,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// Spigot end
public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations;
public static long currentTickLong = 0L; // Paper
@@ -16,7 +16,7 @@ index afaf1d716a95f891056c5241b483309daa997c3d..f477d1c6c0a662dacc924977db1bbe52
public volatile Thread shutdownThread; // Paper
public volatile boolean abnormalExit = false; // Paper
@@ -1172,6 +1173,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1173,6 +1174,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 afaf1d716a95f891056c5241b483309daa997c3d..f477d1c6c0a662dacc924977db1bbe52
}
// Spigot end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ce0f32be89e0a21e536de21e7b24bfa048fd55cb..1de90d5038fa542ac544a19a78796cc20a748017 100644
index c9f1b0b48300d0ea24c62eb83198a4cd54d6cd02..2bc9c1c16ebac1d7d9fcc69497a8ce2c6cb0b4ce 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2925,5 +2925,10 @@ public final class CraftServer implements Server {
@@ -40,7 +40,7 @@ index ce0f32be89e0a21e536de21e7b24bfa048fd55cb..1de90d5038fa542ac544a19a78796cc2
// Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 8578a241b84909b1d4df5963eb9580696fcb3c28..e5e9a4cf8ab5bcfe9eaf2eb7f54d80ece3d6ee4d 100644
index 290c1ac6e1e7bd485a6c63492d4f72b55af7b46b..c8e4ab0302c2cc4bac858169d68adc48c2047026 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -186,6 +186,11 @@ public class PurpurConfig {