Tell players about running with scissors

This commit is contained in:
William Blake Galbreath
2021-07-05 19:00:05 -05:00
parent b2fe934713
commit 2655657046
19 changed files with 116 additions and 63 deletions

View File

@@ -4,6 +4,37 @@ Date: Tue, 29 Jun 2021 21:37:40 -0500
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 0da2dbeba93d428a035872e05177ed3fc29acf9b..f3d23ced47e7dd7bc4005379962a9efcb8edf084 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1677,6 +1677,26 @@ public class ServerPlayer extends Player {
}
// CraftBukkit end
+ // Purpur start
+ public void sendActionBarMessage(@Nullable String message) {
+ if (message != null) {
+ sendActionBarMessage(net.kyori.adventure.text.minimessage.MiniMessage.get().parse(message));
+ }
+ }
+
+ public void sendActionBarMessage(@Nullable net.kyori.adventure.text.Component message) {
+ if (message != null) {
+ sendActionBarMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message));
+ }
+ }
+
+ public void sendActionBarMessage(@Nullable Component message) {
+ if (message != null) {
+ displayClientMessage(message, true);
+ }
+ }
+ // Purpur end
+
@Override
public void displayClientMessage(Component message, boolean actionBar) {
this.sendMessage(message, actionBar ? ChatType.GAME_INFO : ChatType.CHAT, Util.NIL_UUID);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 570cea8ee6a442b2dc3c6ef849294ef0c02027ca..ec98fb6d4a407d5be8faf64db0d73e935e16623d 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java