mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 01:47:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@ed44f69 Fix NamespacedKey#equals not accepting other Key types (#8919) PaperMC/Paper@e2b8e6b chore: update adventure documentation url in javadocs (#8912) PaperMC/Paper@2f953a8 Additional ExplosiveMinecart API (#8896) PaperMC/Paper@fc072c0 Fix forced respawn with respawn anchor (#8845) PaperMC/Paper@16fc1a1 Make PluginProviderContext#getLogger return ComponentLogger, remove PluginProviderContext#getSLF4JLogger (#8921) PaperMC/Paper@9256248 [ci skip] Update README and CONTRIBUTING (#8917) PaperMC/Paper@ad3e1bc Don't log or die on cyclic dependencies of Spigot plugins
This commit is contained in:
@@ -5,7 +5,7 @@ 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 c2ff5d7e4a9f7477b7b207e9d3fb724137a35f11..f3024b03ff7709893d6e39f54504597bb59f5315 100644
|
||||
index 74d332479556ec01cc3fb8d13fe82a77e2fbf3e9..30f95e383a212f396a4e88db29cee18db3c1514b 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
@@ -1739,6 +1739,26 @@ public class ServerPlayer extends Player {
|
||||
@@ -36,10 +36,10 @@ index c2ff5d7e4a9f7477b7b207e9d3fb724137a35f11..f3024b03ff7709893d6e39f54504597b
|
||||
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 a01654bb553c00459e64f16e5ccc91b70cc84444..83b080cfd15b03878acca503f0f416166fbc4e5c 100644
|
||||
index 835e439a1af327c67558653ef79ef7e59692a976..e978172bacfba940a112c35bc666a59b2e1fa83b 100644
|
||||
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||||
@@ -1013,6 +1013,20 @@ public abstract class PlayerList {
|
||||
@@ -1015,6 +1015,20 @@ public abstract class PlayerList {
|
||||
}
|
||||
// CraftBukkit end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user