Fix legacy code detection in PlaceholderAPIMiniMessageParser

Hexaoxide · Jul 19, 2023 · 7a0ff83 · 7a0ff83
1 parent 3401a41
commit 7a0ff83
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/paper/src/main/java/net/draycia/carbon/paper/messages/PlaceholderAPIMiniMessageParser.java b/paper/src/main/java/net/draycia/carbon/paper/messages/PlaceholderAPIMiniMessageParser.java
@@ -28,7 +28,6 @@
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
-import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.checkerframework.checker.nullness.qual.NonNull;
@@ -48,14 +47,13 @@ public static PlaceholderAPIMiniMessageParser create(final MiniMessage backingIn
     }
 
     private static boolean containsLegacyColorCodes(final String string) {
-        final char[] charArray = ChatColor.translateAlternateColorCodes('&', string).toCharArray();
-
-        for (final char c : charArray) {
-            if (c == LegacyComponentSerializer.SECTION_CHAR) {
+        final char[] charArray = string.toCharArray();
+        for (int i = 0; i < charArray.length - 1; i++) {
+            if (charArray[i] == LegacyComponentSerializer.SECTION_CHAR
+                && "0123456789AaBbCcDdEeFfKkLlMmNnOoRrXx".indexOf(charArray[i + 1]) > -1) {
                 return true;
             }
         }
-
         return false;
     }