diff --git a/README.md b/README.md index 41a9a0a..6f5406d 100644 --- a/README.md +++ b/README.md @@ -11,3 +11,5 @@ Permissions: /chat [on/off/clear] - sloudpl.chat Bypass chat off - sloudpl.chat.bypass + +To write in chat with color - sloudchat.colors \ No newline at end of file diff --git a/pom.xml b/pom.xml index b82153d..7bda68e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ pl.sloudpl SloudChat - 1.1 + 1.2 jar SloudChat diff --git a/src/main/java/pl/sloudpl/sloudchat/events/onPlayerChat.java b/src/main/java/pl/sloudpl/sloudchat/events/onPlayerChat.java index 6534b36..dd9f94f 100644 --- a/src/main/java/pl/sloudpl/sloudchat/events/onPlayerChat.java +++ b/src/main/java/pl/sloudpl/sloudchat/events/onPlayerChat.java @@ -21,6 +21,10 @@ public class onPlayerChat implements Listener { @EventHandler public void PlayerChat(AsyncPlayerChatEvent event){ + if(event.isCancelled()){ + return; + } + Player player = event.getPlayer(); if(!plugin.isChatEnabled && !player.hasPermission("sloudpl.chat.bypass")){ @@ -69,9 +73,17 @@ public class onPlayerChat implements Listener { plugin.getLogger().warning("Chat format contains PlaceholderAPI variables but PlaceholderAPI is not installed!"); } - format = format.replace("{MESSAGE}", message); + if(player.hasPermission("sloudchat.colors")){ - format = ChatColor.translateAlternateColorCodes('&', format); + format = format.replace("{MESSAGE}", message); + format = ChatColor.translateAlternateColorCodes('&', format); + + } else { + + format = ChatColor.translateAlternateColorCodes('&', format); + format = format.replace("{MESSAGE}", message); + + } event.setFormat(format.replace("%", "%%")); diff --git a/src/main/java/pl/sloudpl/sloudchat/events/onPlayerChat1_16.java b/src/main/java/pl/sloudpl/sloudchat/events/onPlayerChat1_16.java index e2dc67c..9d5d836 100644 --- a/src/main/java/pl/sloudpl/sloudchat/events/onPlayerChat1_16.java +++ b/src/main/java/pl/sloudpl/sloudchat/events/onPlayerChat1_16.java @@ -71,9 +71,17 @@ public class onPlayerChat1_16 implements Listener { plugin.getLogger().warning("Chat format contains PlaceholderAPI variables but PlaceholderAPI is not installed!"); } - format = format.replace("{MESSAGE}", message); + if(player.hasPermission("sloudchat.colors")){ - format = ColorUtils.convertHexColors(ChatColor.translateAlternateColorCodes('&', format)); + format = format.replace("{MESSAGE}", message); + format = ColorUtils.convertHexColors(ChatColor.translateAlternateColorCodes('&', format)); + + } else { + + format = ColorUtils.convertHexColors(ChatColor.translateAlternateColorCodes('&', format)); + format = format.replace("{MESSAGE}", message); + + } event.setFormat(format.replace("%", "%%")); }