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@152f4fe Add back improved watchdog support patch
PaperMC/Paper@13992b1 Make chunk system loggers calm down a bit
PaperMC/Paper@bf8552f Delegate ItemStack (#10852)
PaperMC/Paper@b3e072a Fix `hasFiredAsync` parameter when `AsyncPlayerSendCommandsEvent` is called (#10896)
PaperMC/Paper@21c9a7c Rebuild patches
PaperMC/Paper@b9f7098 [ci skip] Fix javadoc mistake in EnchantmentRegistryEntry.Builder (#10898)
PaperMC/Paper@b4b8208 Fix NPE for Jukebox#setRecord
This commit is contained in:
granny
2024-06-17 21:39:57 -07:00
parent 45774b4d0e
commit dd826a31ca
20 changed files with 103 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0111-Implement-TPSBar.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement TPSBar
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index c44832599a95039f9ca0f772e7b405e40d7a97b5..37d2e9a7b9a5e9b71a49bdb5d421d5d201c609c5 100644
index 911a12e8af22b5f7a645384fee37c9ad435a9be1..73774049d9d4165036ddf90979d2de837e3701d8 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -253,6 +253,7 @@ public class Commands {
@@ -17,10 +17,10 @@ index c44832599a95039f9ca0f772e7b405e40d7a97b5..37d2e9a7b9a5e9b71a49bdb5d421d5d2
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 2bc6190f17f2874eabcf4606066e4c18a33dcc97..d8194ec9b676582fe5684d1330674ef847a04682 100644
index f1686cca24ff1339ca0062d288ddfe1049e9090a..71cc454cda7ad6253cadaface31de8293df4843a 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1052,6 +1052,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1079,6 +1079,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.safeShutdown(waitForShutdown, false);
}
public void safeShutdown(boolean waitForShutdown, boolean isRestarting) {
@@ -29,7 +29,7 @@ index 2bc6190f17f2874eabcf4606066e4c18a33dcc97..d8194ec9b676582fe5684d1330674ef8
this.hasLoggedStop = true; // Paper - Debugging
if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper - Debugging
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 36351e029c55ccd67b460e90f8c74e3d87f8ae5a..70b0d8f18df7380d54a9c28e0d9060964e338993 100644
index 4582215c4952c8557df0c50cc70302940eff40d7..01fbe7f7d898be5cfc423255e2abb97e75f32718 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -366,6 +366,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -83,7 +83,7 @@ index 7737c2b5aaa8ad8367915991b75aff00d041efab..a1ef38422631b3856160e054daa14eac
// Purpur end
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index c5d1379a95794ca818e2bd3aee49a2226833d137..ffab1dd057ce003c0c7e6ffd9203833a9d5ffd0e 100644
index 7aec825af7d07b1701519e413432739612527747..9b52cb228de73df4fec47b18f1245b34f7ee8aef 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -480,6 +480,7 @@ public abstract class PlayerList {