Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@d5f1ffc Remove somewhat broken patch
This commit is contained in:
BillyGalbreath
2022-12-19 11:11:49 -06:00
parent e2365fa207
commit 4a580c4122
39 changed files with 181 additions and 181 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Component related conveniences
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 0e21e7faf2036f12b64b9237a89ef8e75ebf548d..740eff44b2895f83099beb4bc0e705f4252edc12 100644
index c2ff5d7e4a9f7477b7b207e9d3fb724137a35f11..f3024b03ff7709893d6e39f54504597bb59f5315 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1741,6 +1741,26 @@ public class ServerPlayer extends Player {
@@ -1739,6 +1739,26 @@ public class ServerPlayer extends Player {
this.lastSentExp = -1; // CraftBukkit - Added to reset
}
@@ -36,10 +36,10 @@ index 0e21e7faf2036f12b64b9237a89ef8e75ebf548d..740eff44b2895f83099beb4bc0e705f4
public void displayClientMessage(Component message, boolean overlay) {
this.sendSystemMessage(message, overlay);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index b348d33726b2b14ea2d12ce3430df2c0b94295f4..5f6789783659b3adbdda15705c89a032686f33d5 100644
index c0b599b1835d28ddda3690b29f29bd8c6f03e215..2e434fa0ac143c5751c8f24218ff014cdc119ef5 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1084,6 +1084,20 @@ public abstract class PlayerList {
@@ -1007,6 +1007,20 @@ public abstract class PlayerList {
}
// CraftBukkit end