mirror/Purpur
2
0
Fork 0
mirror of https://github.com/PurpurMC/Purpur.git synced 2025-02-17 13:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

dont send empty messages

Browse Source
This commit is contained in:
Ben Kerllenevich 2022-07-18 22:00:32 -04:00
parent 278bb53a9d
commit 713c7b5e0d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0007-Component-related-conveniences.patch
View File

@ -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 6b63a8e880e93866e12e90769951bfcd844528f9..3ed1bd3f9a75056c040a3563533d53ad4438b962 100644
index 6b63a8e880e93866e12e90769951bfcd844528f9..6ddcb6cce953efd869ddf48b57bbd42f060bed01 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1705,6 +1705,26 @@ public class ServerPlayer extends Player {
@ -14,7 +14,7 @@ index 6b63a8e880e93866e12e90769951bfcd844528f9..3ed1bd3f9a75056c040a3563533d53ad
+ // Purpur start
+ public void sendActionBarMessage(@Nullable String message) {
+ if (message != null) {
+ if (message != null && !message.isEmpty()) {
+ sendActionBarMessage(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(message));
+ }
+ }
@ -36,7 +36,7 @@ index 6b63a8e880e93866e12e90769951bfcd844528f9..3ed1bd3f9a75056c040a3563533d53ad
public void displayClientMessage(Component message, boolean actionBar) {
this.sendSystemMessage(message, actionBar ? ChatType.GAME_INFO : ChatType.SYSTEM);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 20cdfdb3b9351f74e89bc45b3ab972384165659a..3a52624a0e0f5f6667f4bd78c4a42f5568a25ce3 100644
index 20cdfdb3b9351f74e89bc45b3ab972384165659a..13de18b40c2f80ccd9c0ce512e759dbc2804ff83 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1067,6 +1067,20 @@ public abstract class PlayerList {
@ -45,7 +45,7 @@ index 20cdfdb3b9351f74e89bc45b3ab972384165659a..3a52624a0e0f5f6667f4bd78c4a42f55
+ // Purpur Start
+ public void broadcastMiniMessage(@Nullable String message, ResourceKey<ChatType> type) {
+ if (message != null) {
+ if (message != null && !message.isEmpty()) {
+ this.broadcastMessage(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(message), type);
+ }
+ }
@ -81,7 +81,7 @@ index 67bce77093dcc126098731047447da2031e3388d..c4088446d30c3b25cf196f51fd394cd0
return this.isFireSource;
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index beab9f74ba3c3ef294485ee74daf165475d29566..3a8f78ad1037b2bae3ab1ae40cbc25f4acafbc93 100644
index beab9f74ba3c3ef294485ee74daf165475d29566..254ec6a7a742003df0e9ac1e92fe1930d4bf5a3d 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3778,6 +3778,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@ -90,7 +90,7 @@ index beab9f74ba3c3ef294485ee74daf165475d29566..3a8f78ad1037b2bae3ab1ae40cbc25f4
+ // Purpur Start
+ public void sendMiniMessage(@Nullable String message) {
+ if (message != null) {
+ if (message != null && !message.isEmpty()) {
+ this.sendMessage(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(message));
+ }
+ }