Updated Upstream (Paper)

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

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add uptime command
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index e970c11307cd69685878902234271195752f9f51..ca7aa579f6a6c72dfaed04fde84f4dbcc9ca4f34 100644
index 2b61c6fb67141234708707eb07621681f7d8e9b2..dc76507dd19e263cc3a0d566c0ea237ad1203a63 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,7 +17,7 @@ index e970c11307cd69685878902234271195752f9f51..ca7aa579f6a6c72dfaed04fde84f4dbc
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 91495867871320d3a52d2de3ef1d91d57e369b16..c5b96bfe37ce7dfddc20e092356cf621ce4e513a 100644
index 4fbc86086d085681918dc9e6ddfbcad647137948..6767bf0dfc55092144f2c24139ab65fcc274d045 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -281,6 +281,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa