Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07: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@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

8
patches/server/0181-Add-uptime-command.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add uptime command
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index e7fc2beba639e9a6b7fb815508332d3a9e12b666..91d84497dce51cf133a9f4f322b1088cb5ae1beb 100644
index 6e4274ac868e744c63e6faece2bbf3713f47fce0..f11d6bb515217088ef1192653998a77ddce67edf 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 e7fc2beba639e9a6b7fb815508332d3a9e12b666..91d84497dce51cf133a9f4f322b1088c
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index a128c831232ad8a7f6e0166103dc3ab79dc82603..71c506a43e69f7c0c74947387fa6376e9f7343e7 100644
index 9481d4d4b839dca720e1ce2a2feadc7e4a03cc56..bac978e042a1049cc66048a951b068793b855427 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -300,6 +300,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -297,6 +297,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
public OptionSet options;
public org.bukkit.command.ConsoleCommandSender console;
public static int currentTick; // Paper - improve tick loop
@@ -29,7 +29,7 @@ index a128c831232ad8a7f6e0166103dc3ab79dc82603..71c506a43e69f7c0c74947387fa6376e
public int autosavePeriod;
// Paper - don't store the vanilla dispatcher
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index cf7aee68632d1f65ce61f969c5003797ab69b914..286404510ed9b3a5d399697be34740a92b169697 100644
index 60de7cdcee84ba69bc172cee0587e19bb7e5edbc..1578f7a30e575a353a8a7ac286ab4e212dc3f9cc 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -184,6 +184,7 @@ public class PurpurConfig {