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@a61d58d adjust ItemMeta to distinguish null and empty modifiers
PaperMC/Paper@6c02dbc handle recent ItemMeta changes in serialization logic
PaperMC/Paper@447f9a1 [ci skip] Fix paperclip PR label
PaperMC/Paper@b98d20a Brigadier Command Support (#8235)
PaperMC/Paper@ac554ad Updated Upstream (Bukkit/CraftBukkit) (#10691)
PaperMC/Paper@711f82e Fix signed book page serialization (#10696)
This commit is contained in:
granny
2024-05-11 19:35:26 -07:00
parent 479a7d8583
commit 5d3572db65
44 changed files with 245 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0114-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 6af3e1e08048869ac28ab4a93e03d086872f866b..d0a81669ac20dc86e888aa34e246c251b8886ba2 100644
index e7ddfd39b4f9337f5a01f5c34719aea25106a2e8..e7fc2beba639e9a6b7fb815508332d3a9e12b666 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -255,6 +255,7 @@ public class Commands {
@@ -17,10 +17,10 @@ index 6af3e1e08048869ac28ab4a93e03d086872f866b..d0a81669ac20dc86e888aa34e246c251
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 6dd29845955b65e269a0487501330917effe7688..b68db217c8765fa029244bf2701757bd31a5db2b 100644
index 65264b8eb968870e4adb566735f8847a7c316e64..a128c831232ad8a7f6e0166103dc3ab79dc82603 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1060,6 +1060,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1062,6 +1062,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.safeShutdown(waitForShutdown, false);
}
public void safeShutdown(boolean waitForShutdown, boolean isRestarting) {
@@ -29,10 +29,10 @@ index 6dd29845955b65e269a0487501330917effe7688..b68db217c8765fa029244bf2701757bd
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 6d47aa73788eef78aa6714384db879b4e907de9b..8a132fcdeb620d2e7f1c0c8b9e592ff233cd0568 100644
index 6dc0101193c5a1a8850f849d4459462f00ce30e8..04accfaeba1beb564db7205c81d8481dfc679f62 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -363,6 +363,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -362,6 +362,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
DedicatedServer.LOGGER.info("JMX monitoring enabled");
}
@@ -41,7 +41,7 @@ index 6d47aa73788eef78aa6714384db879b4e907de9b..8a132fcdeb620d2e7f1c0c8b9e592ff2
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index fe250c154aed8b10e33c6b916cabedb0dda3d5d6..07d08bc8d95025fda0859c84b9ea84fe6870d004 100644
index 9944905ceb4bd2d0c8fdc1a9a116a3d12d5864f7..614e8a13b2d41bc39e580779798159e0d7b1c7ad 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -299,6 +299,7 @@ public class ServerPlayer extends Player {
@@ -103,7 +103,7 @@ index 338808ba1138f62d89f3f1338a4c5068426df0e4..f2a7eba2618ea9c1acaf93c0ef8f6f5f
entityplayer.awardStat(Stats.LEAVE_GAME);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 4d747759e2bfaebb02a875ff46159d0ae16acad6..a4404782f0456a0bd05b385372ea920bd437eb35 100644
index 62f34324517f13df04b206a82373dbf237f3248c..e8addf65f2980ec325364c534ff72f4a0a6b2a6b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -182,6 +182,7 @@ public class PurpurConfig {