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@46a9d2a Cache Component MOTDs
This commit is contained in:
BillyGalbreath
2022-07-22 22:01:21 -05:00
parent a60a01188e
commit e65c695fc5
13 changed files with 75 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,10 +17,10 @@ index a26672fce303a2ad468014d88033c55789a95e87..c6a97b3fa04c683a92a8d838f98e73b5
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index ce90ecb258c954146fbe7a9f393cbe29061d0e9a..6c593bf7c0ab8f70470705c4210ade11714c4bcc 100644
index 70aa4aa9230b74bae45ef9e3c1f58e4358d2b22b..5b5d3bf526505cb035d968b9e89b40ada5077788 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1045,6 +1045,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1046,6 +1046,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.safeShutdown(flag, false);
}
public void safeShutdown(boolean flag, boolean isRestarting) {
@@ -29,7 +29,7 @@ index ce90ecb258c954146fbe7a9f393cbe29061d0e9a..6c593bf7c0ab8f70470705c4210ade11
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 23454b660c123f4309d1b6eaab8f626f2663f2ef..3f7b8e62bb79d8618f962af4ea5dbec9fffcdf4d 100644
index 13361a344130e32b8145762028caa289cab96f00..b21e0abbc511644274eb2987ea1ff9c8461321b2 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -351,6 +351,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -41,7 +41,7 @@ index 23454b660c123f4309d1b6eaab8f626f2663f2ef..3f7b8e62bb79d8618f962af4ea5dbec9
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 3beced793b745ad309192d5687591d23acf46719..1de4f239dfb63250b7143e89e97487d048b99776 100644
index e9177d815c99450007ddfc9de59cebaa3ae74688..7d7fc0bc857d39cd447f9669d1bd780e64846645 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -262,6 +262,7 @@ public class ServerPlayer extends Player {
@@ -83,7 +83,7 @@ index 3beced793b745ad309192d5687591d23acf46719..1de4f239dfb63250b7143e89e97487d0
// Purpur end
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index dea412353ba3e997d8024cb0770b9ac7300b63a1..7b3ad3316243d0d8fd2106a0f0475e1b5fadb1d0 100644
index 9b4fa8bac4d8316848c82401ce5c36a6b4b10671..fefc6482191b7d3df37d35dfa6d0ebce4d202906 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -496,6 +496,7 @@ public abstract class PlayerList {
@@ -104,7 +104,7 @@ index dea412353ba3e997d8024cb0770b9ac7300b63a1..7b3ad3316243d0d8fd2106a0f0475e1b
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 65e8b5569ff12fc2a49b601b5f970dfd8b223f62..68ae78e98df34849e0a3c97d27b26d0f45cf4bb7 100644
index b2e456e83137f70ca21358d0da2f777a98a4e2be..27794670b54f1a96e4e82ed23ab0769a0506b52a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -176,6 +176,7 @@ public class PurpurConfig {