2nd Attempt at fixing #34

RefracDevelopment · May 25, 2024 · 47347ea · 47347ea
1 parent f306301
commit 47347ea
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/SimpleStaffChat-Bungee/pom.xml b/SimpleStaffChat-Bungee/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>me.refracdevelopment</groupId>
         <artifactId>SimpleStaffChat</artifactId>
-        <version>4.3.1</version>
+        <version>4.3.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/SimpleStaffChat-Spigot/pom.xml b/SimpleStaffChat-Spigot/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>me.refracdevelopment</groupId>
         <artifactId>SimpleStaffChat</artifactId>
-        <version>4.3.1</version>
+        <version>4.3.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/...got/src/main/java/me/refracdevelopment/simplestaffchat/utilities/chat/RyMessageUtils.java b/...got/src/main/java/me/refracdevelopment/simplestaffchat/utilities/chat/RyMessageUtils.java
@@ -93,9 +93,9 @@ public static Component translate(Player player, String message) {
         message = Placeholders.setPlaceholders(player, message);
 
         if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) {
-            String PAPI = PlaceholderAPI.setPlaceholders(player, message);
+             message = PlaceholderAPI.setPlaceholders(player, message);
 
-            return translate(PAPI);
+            return translate(message);
         }
 
         return translate(message);
@@ -115,7 +115,14 @@ public static Component translate(String message) {
         return component;
     }
 
-    // Taken from https://github.com/EternalCodeTeam/ChatFormatter/
+    /**
+     * Translate a string from legacy to Adventure API.
+     *
+     * @param input The string that needs translating.
+     * @return      String which is in an adventure format.
+     *
+     * @Author: EternalCodeTeam (https://github.com/EternalCodeTeam/ChatFormatter/)
+     */
     private static String legacyToAdventure(String input) {
         String result = HEX_PATTERN.matcher(input).replaceAll(matchResult -> {
             String hex = matchResult.group(1);
@@ -199,8 +206,6 @@ public static void sendPlayer(Player player, @NotNull List<String> messages) {
      * @param message The message you wish to send to the sender.
      */
     public static void sendSender(@NotNull CommandSender sender, @NotNull String message) {
-        message = Placeholders.setPlaceholders(sender, message);
-
         if (getAudiences() != null) {
             getAudiences().sender(sender).sendMessage(translate(message));
         } else {
@@ -216,8 +221,6 @@ public static void sendSender(@NotNull CommandSender sender, @NotNull String mes
      */
     public static void sendSender(@NotNull CommandSender sender, @NotNull String... messages) {
         for (String message : messages) {
-            message = Placeholders.setPlaceholders(sender, message);
-
             if (getAudiences() != null) {
                 getAudiences().sender(sender).sendMessage(translate(message));
             } else {
@@ -234,8 +237,6 @@ public static void sendSender(@NotNull CommandSender sender, @NotNull String...
      */
     public static void sendSender(@NotNull CommandSender sender, @NotNull List<String> messages) {
         for (String message : messages) {
-            message = Placeholders.setPlaceholders(sender, message);
-
             if (getAudiences() != null) {
                 getAudiences().sender(sender).sendMessage(translate(message));
             } else {

diff --git a/SimpleStaffChat-Velocity/pom.xml b/SimpleStaffChat-Velocity/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>me.refracdevelopment</groupId>
         <artifactId>SimpleStaffChat</artifactId>
-        <version>4.3.1</version>
+        <version>4.3.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.refracdevelopment</groupId>
     <artifactId>SimpleStaffChat</artifactId>
-    <version>4.3.1</version>
+    <version>4.3.2</version>
     <packaging>pom</packaging>
 
     <name>SimpleStaffChat</name>