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

upstream

Browse Source
This commit is contained in:
Ben Kerllenevich
2022-06-09 20:03:02 -04:00
parent 102b3130fe
commit 4f291c3b98
30 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0124-Implement-TPSBar.patch
View File

@@ -17,7 +17,7 @@ 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 862825556b52bb65a003fa633f08ed42cd6ad1fa..90b192ea540c99df4d9ba8713f126cd7f1cdc81d 100644
index f1198c07e479954a1be1e9fe52329a660ed15e9b..e5c42c28556d1ffca8b4c7a51fffb9c54236dad7 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1043,6 +1043,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -29,10 +29,10 @@ index 862825556b52bb65a003fa633f08ed42cd6ad1fa..90b192ea540c99df4d9ba8713f126cd7
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 6d0a0186778a115f556bbb376a9c1684f9c5740c..eb17a81e5d45892bf5623160d03197591ddc2ac1 100644
index a4f19720738b167fd5932defabff9aa144f59c37..27ad703c5b723f3cd9c8fb8d231e3f065f217353 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -347,6 +347,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -348,6 +348,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
DedicatedServer.LOGGER.info("JMX monitoring enabled");
}
@@ -41,7 +41,7 @@ index 6d0a0186778a115f556bbb376a9c1684f9c5740c..eb17a81e5d45892bf5623160d0319759
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 6228ee10d8227d3bc8934dc22d201bdf4fc343fd..749c423c4b2da0520f2fd87530b0e486819fba1e 100644
index fe2d7acece87d5b825f3f3668c11c0efc877439b..c65eeec4ee990a1efaf5648ca31f8bb4a178ce2b 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 6228ee10d8227d3bc8934dc22d201bdf4fc343fd..749c423c4b2da0520f2fd87530b0e486
// 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 f2b863ade7c8d620542510f733ad6c5f03d78388..9d8635530bc2c0b322d3b45542106ac98a4d4122 100644
index dea412353ba3e997d8024cb0770b9ac7300b63a1..7b3ad3316243d0d8fd2106a0f0475e1b5fadb1d0 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 {