diff --git a/api/src/main/java/com/alttd/chat/config/Config.java b/api/src/main/java/com/alttd/chat/config/Config.java index 6098952..1b9cdd1 100755 --- a/api/src/main/java/com/alttd/chat/config/Config.java +++ b/api/src/main/java/com/alttd/chat/config/Config.java @@ -164,7 +164,6 @@ public final class Config { public static String MINIMIUMSTAFFRANK = "trainee"; public static String CONSOLENAME = "Console"; public static UUID CONSOLEUUID = UUID.randomUUID(); - public static String NOTIFICATIONFORMAT = "[] "; private static void settings() { PREFIXGROUPS = getList("settings.prefix-groups", Lists.newArrayList("discord", "socialmedia", "eventteam", "eventleader", "youtube", "twitch", "developer")); @@ -175,7 +174,6 @@ public final class Config { CONSOLENAME = getString("settings.console-name", CONSOLENAME); CONSOLEUUID = UUID.fromString(getString("settings.console-uuid", CONSOLEUUID.toString())); MINIMIUMSTAFFRANK = getString("settings.minimum-staff-rank", MINIMIUMSTAFFRANK); - NOTIFICATIONFORMAT = getString("settings.blockedmessage-notification", NOTIFICATIONFORMAT); } public static List MESSAGECOMMANDALIASES = new ArrayList<>(); @@ -290,4 +288,9 @@ public final class Config { PASSWORD = getString("database.password", PASSWORD); } + public static String NOTIFICATIONFORMAT = "[] "; + private static void notificationSettings() { + NOTIFICATIONFORMAT = getString("settings.blockedmessage-notification", NOTIFICATIONFORMAT); + } + } diff --git a/galaxy/dependency-reduced-pom.xml b/galaxy/dependency-reduced-pom.xml index 47374fc..d50f3e4 100644 --- a/galaxy/dependency-reduced-pom.xml +++ b/galaxy/dependency-reduced-pom.xml @@ -70,7 +70,7 @@ com.alttd galaxy-api - 1.17-R0.1-SNAPSHOT + 1.17.1-R0.1-SNAPSHOT compile diff --git a/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java b/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java index f616f09..4d1c18b 100755 --- a/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java +++ b/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java @@ -255,17 +255,7 @@ public class ChatHandler { private boolean isMuted(Player player, String message, String prefix) { if (Database.get().isPlayerMuted(player.getUniqueId(), null) || (ChatPlugin.getInstance().serverMuted() && !player.hasPermission("chat.bypass-server-muted"))) { - MiniMessage miniMessage = MiniMessage.get(); - Component blockedNotification = miniMessage.parse("" + prefix - + Utility.getDisplayName(player.getUniqueId(), player.getName()) - + " tried to say: " - + message + ""); - - Bukkit.getOnlinePlayers().forEach(a ->{ - if (a.hasPermission("chat.alert-blocked")) { - a.sendMessage(blockedNotification);//TODO make configurable (along with all the messages) - } - }); + GalaxyUtility.sendBlockedNotification(prefix, player, message, ""); return true; } return false; diff --git a/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java b/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java index 218ddec..e97f2b6 100755 --- a/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java +++ b/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java @@ -34,13 +34,7 @@ public class ChatListener implements Listener, ChatRenderer { event.setCancelled(true); Player player = event.getPlayer(); - MiniMessage miniMessage = MiniMessage.get(); - Component blockedNotification = miniMessage.parse("[Chat Muted] " - + Utility.getDisplayName(player.getUniqueId(), player.getName()) - + " tried to say: " - + PlainComponentSerializer.plain().serialize(event.message()) + ""); - - Bukkit.broadcast(blockedNotification, "chat.alert-blocked"); + GalaxyUtility.sendBlockedNotification("Chat Muted", player, event.message(), ""); return; }