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@a15152e Allow old behavior for CommandRegisteredEvent (#8249)
PaperMC/Paper@0118c0b Improve MojangAPI docs and replace @Deprecated with @ApiStatus.Experimental on draft APIs (#8261)
PaperMC/Paper@3624637 Improve documentation of Inventory#removeItem (#8263)
PaperMC/Paper@a47301e Fix Player#chat kicking all clients (#8262)
PaperMC/Paper@78b19f8 Separate Command Sending to Separate Thread Pool (#8170)
This commit is contained in:
BillyGalbreath
2022-08-08 09:23:12 -05:00
parent 7e7693cb64
commit 28e3713086
23 changed files with 90 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Implement TPSBar
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index 55b1ebd17af11ac29fb6b1d4572fb1fc260c16ac..e970c11307cd69685878902234271195752f9f51 100644
index 5e3d903da89ddebb7aae82347ff26e60de1905e8..2b61c6fb67141234708707eb07621681f7d8e9b2 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -211,6 +211,7 @@ public class Commands {
@@ -210,6 +210,7 @@ public class Commands {
org.purpurmc.purpur.command.CreditsCommand.register(this.dispatcher); // Purpur
org.purpurmc.purpur.command.DemoCommand.register(this.dispatcher); // Purpur
org.purpurmc.purpur.command.PingCommand.register(this.dispatcher); // Purpur
@@ -17,10 +17,10 @@ index 55b1ebd17af11ac29fb6b1d4572fb1fc260c16ac..e970c11307cd69685878902234271195
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 2ee6df3e1a79047de97f4776c6f7e2e549d78c68..91495867871320d3a52d2de3ef1d91d57e369b16 100644
index b757c09223e2937a1fa06edd8e1bad63ed122620..4fbc86086d085681918dc9e6ddfbcad647137948 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1048,6 +1048,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1049,6 +1049,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.safeShutdown(flag, false);
}
public void safeShutdown(boolean flag, boolean isRestarting) {
@@ -41,7 +41,7 @@ index 629024e5c3f480bd50ae2df9dadb72f06a62c3bf..19bf680e222d7f91a0e7f67b29e3a5e3
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 9296eedcb77dcb7068d7816cd10459d48e93ebba..b7f93bd215b01be450e2a1a58aadf84ccf811525 100644
index 725358518b73b908c8150bdbabed68909c91f4d4..b858ce2ad443f6690dd71e56fb9eea14793df19d 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -264,6 +264,7 @@ public class ServerPlayer extends Player {
@@ -83,7 +83,7 @@ index 9296eedcb77dcb7068d7816cd10459d48e93ebba..b7f93bd215b01be450e2a1a58aadf84c
// 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 4b1c9e75bb4148335a106083dd8199fa1f7d808d..0e690d78c295ca13262230e105a3a26b89c26496 100644
index 0056694109587822601620df5062d933325ec2ae..37255fb6bff06d2aabf2acd2d435269b1a9dbb15 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -497,6 +497,7 @@ public abstract class PlayerList {