Added the ability to use colors within island chat (#1081)

BG-Software-LLC · Apr 30, 2022 · b3e9ce8 · b3e9ce8
1 parent 751aa8f
commit b3e9ce8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/com/bgsoftware/superiorskyblock/commands/player/CmdTeamChat.java b/src/main/java/com/bgsoftware/superiorskyblock/commands/player/CmdTeamChat.java
@@ -73,7 +73,7 @@ public void execute(SuperiorSkyblockPlugin plugin, CommandSender sender, String[
             }
             superiorPlayer.toggleTeamChat();
         } else {
-            String message = CommandArguments.buildLongString(args, 1, true);
+            String message = CommandArguments.buildLongString(args, 1, superiorPlayer.hasPermissionWithoutOP("superior.chat.color"));
             IslandUtils.sendMessage(island, Message.TEAM_CHAT_FORMAT, new ArrayList<>(), superiorPlayer.getPlayerRole(),
                     superiorPlayer.getName(), message);
             Message.SPY_TEAM_CHAT_FORMAT.send(Bukkit.getConsoleSender(), superiorPlayer.getPlayerRole(), superiorPlayer.getName(), message);

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/listeners/PlayersListener.java b/src/main/java/com/bgsoftware/superiorskyblock/listeners/PlayersListener.java
@@ -355,7 +355,9 @@ public void onPlayerAsyncChat(AsyncPlayerChatEvent e) {
 
             e.setCancelled(true);
 
-            EventResult<String> eventResult = plugin.getEventsBus().callIslandChatEvent(island, superiorPlayer, e.getMessage());
+            EventResult<String> eventResult = plugin.getEventsBus().callIslandChatEvent(island, superiorPlayer,
+                    superiorPlayer.hasPermissionWithoutOP("superior.chat.color") ?
+                            Formatters.COLOR_FORMATTER.format(e.getMessage()) : e.getMessage());
 
             if (eventResult.isCancelled())
                 return;

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -327,4 +327,6 @@ permissions:
           superior.admin.withdraw:
             description: Withdraw money from another player's island bank.
           superior.admin.world:
-            description: Unlock a world for an island.
+            description: Unlock a world for an island.
+      superior.chat.color:
+        description: Gives access to use colors within island chat.