Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@babffb5 Undeprecate and fix Boat#getBoatMaterial (#8217)
PaperMC/Paper@d60497e Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@dd3e4e7 Initial support for signed messages (#8198)
PaperMC/Paper@ceef4b9 Don't call AsyncTabCompleteEvent from netty IO thread (#8218)
PaperMC/Paper@e0486ae Fix suggest command message for brigadier syntax exceptions (#8221)
This commit is contained in:
BillyGalbreath
2022-08-02 05:40:22 -05:00
parent a0e4e69dfb
commit e3f739bafd
27 changed files with 99 additions and 225 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add compass command
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index 076008b0109669671546e1e476b5c812628d81bd..a1b80de62f07e0b476775289ec46e3f685b41d7f 100644
index ca7aa579f6a6c72dfaed04fde84f4dbcc9ca4f34..5b4a89c696f6457bef24bb8792303dfde7ae510c 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -213,6 +213,7 @@ public class Commands {
@@ -17,7 +17,7 @@ index 076008b0109669671546e1e476b5c812628d81bd..a1b80de62f07e0b476775289ec46e3f6
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index d7ea9e8053b96c32ca94f82a89f58223f9983ff1..d042f2866a513263cc1b82df1cabe7fee81a1603 100644
index 9eb1c15d831cd5ccdbd1e28bbf2d994bfae4f039..3133b14e2fcef91cf3a72b5f65102aef43b92459 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -265,6 +265,7 @@ public class ServerPlayer extends Player {
@@ -44,7 +44,7 @@ index d7ea9e8053b96c32ca94f82a89f58223f9983ff1..d042f2866a513263cc1b82df1cabe7fe
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2621,5 +2624,13 @@ public class ServerPlayer extends Player {
@@ -2626,5 +2629,13 @@ public class ServerPlayer extends Player {
public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar;
}