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

Preliminary update to 1.17.1

Browse Source
This commit is contained in:
William Blake Galbreath
2021-07-06 16:25:46 -05:00
parent 89c9c902b1
commit 471d6bf4c1
202 changed files with 994 additions and 20192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0143-Implement-TPSBar.patch
View File

@@ -17,10 +17,10 @@ index f164106a957c24bdb71bde85d82948a64613fd91..bef1f6ca54fc6c1741b54b8e071a90eb
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 9017d3626f4982a41d34d65758de4844e5502a9c..108dadb24607ea42cf857879386c34c9bb72dbee 100644
index afe22502613d131bbca9af28b1716768e9a46f9c..4410ead33e18790f8674765affeba736a89c8ddd 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1111,6 +1111,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1048,6 +1048,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.safeShutdown(flag, false);
}
public void safeShutdown(boolean flag, boolean isRestarting) {
@@ -29,10 +29,10 @@ index 9017d3626f4982a41d34d65758de4844e5502a9c..108dadb24607ea42cf857879386c34c9
this.hasLoggedStop = true; // Paper
if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 6e67ea018cd6f362bba104f542c52438b455ccab..66d2559e5bd8630c6cbca0fe8d0eb1f756c388df 100644
index 1f9cc47bac2cd8344ecc355c22101fc48b13fb62..5d9d76f1b90e991bb01b059da86dcdd483d93c80 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -347,6 +347,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -348,6 +348,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
DedicatedServer.LOGGER.info("JMX monitoring enabled");
}
@@ -42,10 +42,10 @@ index 6e67ea018cd6f362bba104f542c52438b455ccab..66d2559e5bd8630c6cbca0fe8d0eb1f7
}
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 7d7e5b7508470c0570e7f0becd607a2c35d17d6b..3f5002c106ef251ed0c30e61a8726c1a35c51c21 100644
index 1dae795321bc35ceaedd6f9218b61e6231066e7b..c93a5bbf546b8b501306a98e84f995ec1a8c8c9e 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -586,6 +586,8 @@ public abstract class PlayerList {
@@ -587,6 +587,8 @@ public abstract class PlayerList {
}
public net.kyori.adventure.text.Component disconnect(ServerPlayer entityplayer) { // Paper - return Component