From 8ae6e9212c4dcceb4138120c98dff3bbd4e89a39 Mon Sep 17 00:00:00 2001 From: youhavetrouble Date: Thu, 22 Jun 2023 15:36:08 +0200 Subject: [PATCH] actually check for empty string and not for null --- .../preventstabby/util/PluginMessages.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/me/youhavetrouble/preventstabby/util/PluginMessages.java b/src/main/java/me/youhavetrouble/preventstabby/util/PluginMessages.java index c62d2b4..826a331 100644 --- a/src/main/java/me/youhavetrouble/preventstabby/util/PluginMessages.java +++ b/src/main/java/me/youhavetrouble/preventstabby/util/PluginMessages.java @@ -24,7 +24,6 @@ public class PluginMessages { } public static Component parseMessage(CommandSender sender,String message) { - if (sender instanceof Player && isPlaceholderApiEnabled()) { Player player = (Player) sender; message = PlaceholderAPI.setPlaceholders(player, message); @@ -37,18 +36,18 @@ public class PluginMessages { } public static void sendMessage(CommandSender sender, String message) { - if (message == null) return; + if ("".equals(message)) return; audiences.sender(sender).sendMessage(parseMessage(sender, message)); } public static void sendActionBar(Player player, String message) { - if (message == null) return; + if ("".equals(message)) return; Component parsedMessage = parseMessage(player, message); audiences.player(player).sendActionBar(parsedMessage); } public static void sendActionBar(UUID uuid, String message) { - if (message == null) return; + if ("".equals(message)) return; Player player = Bukkit.getPlayer(uuid); if (player == null) return; sendActionBar(player, message); @@ -60,7 +59,7 @@ public class PluginMessages { } public static void broadcastMessage(Player player, String message) { - if (message == null) return; + if ("".equals(message)) return; message = parsePlayerName(player, message); if (PreventStabby.getPlugin().getServer().getPluginManager().getPlugin("PlaceholderAPI") != null) { message = PlaceholderAPI.setPlaceholders(player, message); @@ -69,6 +68,7 @@ public class PluginMessages { } public static void broadcastMessage(String message) { + if ("".equals(message)) return; audiences.all().sendMessage(parseMessage(message)); }