From 144a08ee116ac85beb5e16782a91fc823431c5d5 Mon Sep 17 00:00:00 2001 From: Oharass Date: Sun, 3 Oct 2021 14:16:58 -0500 Subject: [PATCH] fix empty messages still sending (#694) --- patches/server/0006-Component-related-conveniences.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/server/0006-Component-related-conveniences.patch b/patches/server/0006-Component-related-conveniences.patch index ae9e85af4..93cb63484 100644 --- a/patches/server/0006-Component-related-conveniences.patch +++ b/patches/server/0006-Component-related-conveniences.patch @@ -103,7 +103,7 @@ index ad9fb50791779a5fe7d22268b71bd10d9c9ff3f0..1c1602f839828252748e1acacfe42c7c this.server.sendMessage(message, sender); Iterator iterator = this.players.iterator(); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 5d455a662107182659abcbe83195ac5d6cf25813..518a8b1e165d49350931dfaefa6cef01729c7f92 100644 +index 5d455a662107182659abcbe83195ac5d6cf25813..22a730d1b2f8ede06ae3366344af5120134d1af7 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3596,6 +3596,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -116,7 +116,7 @@ index 5d455a662107182659abcbe83195ac5d6cf25813..518a8b1e165d49350931dfaefa6cef01 + } + + public void sendMessage(@Nullable String message, UUID sender) { -+ if (message != null) { ++ if (org.apache.commons.lang3.StringUtils.isNotEmpty(message)) { + sendMessage(net.kyori.adventure.text.minimessage.MiniMessage.get().parse(message), sender); + } + }