From 8cfe680abc79a67af4e3917810c78946740c1937 Mon Sep 17 00:00:00 2001
From: pop4959 <pop4959@gmail.com>
Date: Mon, 25 Mar 2024 12:09:13 -0700
Subject: [PATCH 1/2] Fix empty translations being sent to Console (#5737)

---
 .../src/main/java/com/earth2me/essentials/CommandSource.java  | 4 +++-
 Essentials/src/main/java/com/earth2me/essentials/Console.java | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Essentials/src/main/java/com/earth2me/essentials/CommandSource.java b/Essentials/src/main/java/com/earth2me/essentials/CommandSource.java
index 59a88a21b..ed8d5bdb6 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/CommandSource.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/CommandSource.java
@@ -36,7 +36,9 @@ public class CommandSource {
         }
 
         final String translation = tlLiteral(tlKey, args);
-        sendComponent(AdventureUtil.miniMessage().deserialize(translation));
+        if (!translation.isEmpty()) {
+            sendComponent(AdventureUtil.miniMessage().deserialize(translation));
+        }
     }
 
     public String tl(final String tlKey, final Object... args) {
diff --git a/Essentials/src/main/java/com/earth2me/essentials/Console.java b/Essentials/src/main/java/com/earth2me/essentials/Console.java
index 9dacde649..6414f3cef 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/Console.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/Console.java
@@ -69,6 +69,9 @@ public final class Console implements IMessageRecipient {
     @Override
     public void sendTl(String tlKey, Object... args) {
         final String translation = tlLiteral(tlKey, args);
+        if (translation.isEmpty()) {
+            return;
+        }
 
         final Audience consoleAudience = ((Essentials) ess).getBukkitAudience().sender(getCommandSender());
         final Component component = AdventureUtil.miniMessage()

From 76a513a05c1693648a4328fcdefcc00134989207 Mon Sep 17 00:00:00 2001
From: pop4959 <pop4959@gmail.com>
Date: Mon, 25 Mar 2024 12:11:18 -0700
Subject: [PATCH 2/2] Don't run keyword replacer by default in translated
 broadcasts (#5739)

Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
---
 .../src/main/java/com/earth2me/essentials/Essentials.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Essentials/src/main/java/com/earth2me/essentials/Essentials.java b/Essentials/src/main/java/com/earth2me/essentials/Essentials.java
index 81a4ab8f3..a095ba8aa 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/Essentials.java
@@ -1200,7 +1200,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
 
     @Override
     public void broadcastTl(final String tlKey, final Object... args) {
-        broadcastTl(null, null, true, tlKey, args);
+        broadcastTl(null, null, false, tlKey, args);
     }
 
     @Override