From a24d6c14ff4020045f4d0b01fcf7f8ad046867b1 Mon Sep 17 00:00:00 2001 From: ThiagoROX <51332006+SrBedrock@users.noreply.github.com> Date: Mon, 12 Feb 2024 19:55:45 -0300 Subject: [PATCH 1/2] Don't send empty string Close #705 --- .../kernitus/plugin/OldCombatMechanics/utilities/Messenger.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/kernitus/plugin/OldCombatMechanics/utilities/Messenger.java b/src/main/java/kernitus/plugin/OldCombatMechanics/utilities/Messenger.java index 480246ce..17255a81 100644 --- a/src/main/java/kernitus/plugin/OldCombatMechanics/utilities/Messenger.java +++ b/src/main/java/kernitus/plugin/OldCombatMechanics/utilities/Messenger.java @@ -53,7 +53,7 @@ public static void warn(String message, Object... args) { public static void sendNoPrefix(CommandSender sender, String message, Object... args) { Objects.requireNonNull(sender, "sender cannot be null!"); Objects.requireNonNull(message, "message cannot be null!"); - + if (message.isEmpty()) return; sender.sendMessage(TextUtils.colourise(String.format(message, args))); } From c3c4d4b2073b76a404bb8dc4681806fc819d496e Mon Sep 17 00:00:00 2001 From: ThiagoROX <51332006+SrBedrock@users.noreply.github.com> Date: Tue, 13 Feb 2024 01:05:12 -0300 Subject: [PATCH 2/2] Added comments to config.yml --- .../kernitus/plugin/OldCombatMechanics/utilities/Messenger.java | 1 + src/main/resources/config.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/main/java/kernitus/plugin/OldCombatMechanics/utilities/Messenger.java b/src/main/java/kernitus/plugin/OldCombatMechanics/utilities/Messenger.java index 17255a81..51b12187 100644 --- a/src/main/java/kernitus/plugin/OldCombatMechanics/utilities/Messenger.java +++ b/src/main/java/kernitus/plugin/OldCombatMechanics/utilities/Messenger.java @@ -53,6 +53,7 @@ public static void warn(String message, Object... args) { public static void sendNoPrefix(CommandSender sender, String message, Object... args) { Objects.requireNonNull(sender, "sender cannot be null!"); Objects.requireNonNull(message, "message cannot be null!"); + // Prevents sending of individual empty messages, allowing for selective message disabling. if (message.isEmpty()) return; sender.sendMessage(TextUtils.colourise(String.format(message, args))); } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 39f36e2d..72ec28c8 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -47,6 +47,8 @@ worlds: mode-messages: # Messages used when changing player mode + # To disable any message, leave the corresponding string empty (e.g., mode-status: ""). + # This applies to all messages in the configuration. mode-status: "&bYour current modeset is: &7%s" message-usage: "&eYou can use &c/ocm mode [player] &eto change modeset" invalid-modeset: "&cPlease specify a valid modeset!"