Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37: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@b8edb0e Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9648)
PaperMC/Paper@b4e3b3d Allow non-op players to execute the click event callback (#9652)
This commit is contained in:
granny
2023-08-29 03:15:55 -07:00
parent 6e2126ffcb
commit 423c2af60c
17 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0047-Configurable-TPS-Catchup.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable TPS Catchup
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 9abd0167f644194367fab679f878c0288758d898..82cd8c65268838f0bad3b15a8a228fb5b9a30b07 100644
index 287f5b64622cdc98cbe8248c89af27c97fdf8347..eda8479d26d5ccbb516adc6c483c1c8366375ddd 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1175,7 +1175,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1174,7 +1174,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.tickServer(this::haveTime);
this.profiler.popPush("nextTickWait");
this.mayHaveDelayedTasks = true;
@@ -24,7 +24,7 @@ index 9abd0167f644194367fab679f878c0288758d898..82cd8c65268838f0bad3b15a8a228fb5
this.profiler.pop();
this.endMetricsRecordingTick();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 9db231480f0763c2b6514a956ec9398b98b7d1bc..4905358e2a1939bfba963bda3fcf914721dfac45 100644
index 308d7556f5b12c0aa5b2fde5a23ef6fbacb303de..e2edbb0842862b8ffdf30cec104a1d71a71e92e0 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -248,4 +248,9 @@ public class PurpurConfig {