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

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

@@ -17,11 +17,11 @@ index 4e721dfca7559620d8ce65a6703f2089a839f4a0..7aae9e3c60ba15b8dcd8174a4d70866e
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 70c2ccc971600f856b90b2fb1b51cb2f51e21cdd..f814bb61cb6981202db1a04ef3c114afb0aa55ee 100644
index d87e3a201d0fddd4c212de1de98ca2870e481149..49286716235f3bd49cbc42ef693daafba746f930 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -294,6 +294,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
public org.bukkit.command.RemoteConsoleCommandSender remoteConsole;
@@ -293,6 +293,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
public org.bukkit.command.ConsoleCommandSender console;
//public ConsoleReader reader; // Paper
public static int currentTick = 0; // Paper - Further improve tick loop
+ public static final long startTimeMillis = System.currentTimeMillis();
@@ -29,7 +29,7 @@ index 70c2ccc971600f856b90b2fb1b51cb2f51e21cdd..f814bb61cb6981202db1a04ef3c114af
public int autosavePeriod;
public Commands vanillaCommandDispatcher;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 6919c6779e54526b7666eb6b21556b7b752bf053..f5a5cc0f954f33f75b542c33d8385076a8aad163 100644
index b1450f979efb13a31f96b0638d415f807c5c6a4f..c33c31956de911ff03f4782ab811a84ba18241c9 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 {