Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +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@3fc9358 Show stacktrace when modifyItemStack fails
PaperMC/Paper@f175193 Expose server build information (#10729)
This commit is contained in:
granny
2024-05-16 19:11:29 -07:00
parent ba950ad775
commit 69d3bb4c2d
71 changed files with 246 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0295-config-for-startup-commands.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] config for startup commands
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 642627e37014d5bf634ea7a153ce1abf0be9bf06..dfe3d28bd97d1335457d1005ecf69afe75d5ff80 100644
index 72eee1f7f29578a1d20245e0e4d90e11046ffe39..71705ccbc0cce88382b1fb536271773a332ad3a2 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1190,6 +1190,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1187,6 +1187,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
// Paper end - Add onboarding message for initial server start
@@ -26,7 +26,7 @@ index 642627e37014d5bf634ea7a153ce1abf0be9bf06..dfe3d28bd97d1335457d1005ecf69afe
// Paper start - rewrite chunk system
// guarantee that nothing can stop the server from halting if it can at least still tick
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index a343ad765c2779e9c83bc037ec9e3a24b07b0115..de70bfdbdd7740fdf20dd063a7a623a9e96cef98 100644
index 57c6ea58a6a01006bee4aa2dec401061777f3b0e..b5092184076946b7169b67086b9542a9685c15f3 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -586,4 +586,16 @@ public class PurpurConfig {