Message: fix PAPI formatting for all players

Flectone · Sep 28, 2023 · e75708f · e75708f
1 parent 85f48d1
commit e75708f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/main/java/net/flectone/messages/MessageBuilder.java b/src/main/java/net/flectone/messages/MessageBuilder.java
@@ -345,11 +345,11 @@ public String getMessage(String color) {
             }
 
             if (sender.hasPermission("flectonechat.placeholders")) {
-                word = ObjectUtil.formatPAPI(word, sender, sender);
+                word = ObjectUtil.formatPAPI(word, sender, sender, true);
             }
 
             if (sender.hasPermission("flectonechat.formatting")) {
-                word = ObjectUtil.formatString(word, sender, sender);
+                word = ObjectUtil.formatString(word, sender, sender, true);
             }
 
             color = ChatColor.getLastColors(color) + ChatColor.getLastColors(word);
@@ -404,13 +404,13 @@ public BaseComponent[] buildMessage(@NotNull String lastColor, @NotNull CommandS
             }
 
             if (sender.hasPermission("flectonechat.placeholders")) {
-                word = ObjectUtil.formatPAPI(word, sender, sender);
+                word = ObjectUtil.formatPAPI(word, sender, sender, true);
             }
 
             if (sender.hasPermission("flectonechat.formatting") && !wordParams.isEdited()) {
                 wordParams.setFormatted(true);
 
-                String newWord = ObjectUtil.formatString(lastColor + wordParams.getText(), recipient, sender);
+                String newWord = ObjectUtil.formatString(lastColor + wordParams.getText(), recipient, sender, true);
                 lastColor = ChatColor.getLastColors(newWord);
 
                 word = lastColor + wordParams.getFormatting() + ChatColor.stripColor(newWord);

diff --git a/src/main/java/net/flectone/utils/ObjectUtil.java b/src/main/java/net/flectone/utils/ObjectUtil.java
@@ -94,11 +94,16 @@ public static String translateHexToColor(@NotNull String string) {
 
     @NotNull
     public static String formatString(@NotNull String string, @Nullable CommandSender recipient, @Nullable CommandSender sender) {
+        return formatString(string, recipient, sender, false);
+    }
+
+    @NotNull
+    public static String formatString(@NotNull String string, @Nullable CommandSender recipient, @Nullable CommandSender sender, boolean needPermission) {
         String[] colors = null;
 
         if (recipient instanceof Player playerRecipient) {
 
-            string = formatPAPI(string, recipient, sender);
+            string = formatPAPI(string, recipient, sender, needPermission);
 
             FPlayer fPlayer = FPlayerManager.getPlayer(playerRecipient);
             colors = fPlayer != null ? fPlayer.getColors() : null;
@@ -112,11 +117,11 @@ public static String formatString(@NotNull String string, @Nullable CommandSende
     }
 
     @NotNull
-    public static String formatPAPI(@NotNull String string, @Nullable CommandSender recipient, @Nullable CommandSender sender) {
+    public static String formatPAPI(@NotNull String string, @Nullable CommandSender recipient, @Nullable CommandSender sender, boolean needPermission) {
         if (recipient instanceof Player playerRecipient) {
             if (HookManager.enabledPlaceholderAPI
                     && sender instanceof Player playerSender
-                    && sender.hasPermission("flectonechat.placeholders")) {
+                    && (sender.hasPermission("flectonechat.placeholders") || !needPermission)) {
 
                 string = PlaceholderAPI.setPlaceholders(playerSender, string);
                 string = PlaceholderAPI.setRelationalPlaceholders(playerSender, playerRecipient, string);