From d63d7dc5f84d99cab09afeac41f5d9eb9eba01fc Mon Sep 17 00:00:00 2001
From: Sxtanna <ranald.taylor@gmail.com>
Date: Wed, 22 Jul 2020 23:59:39 -0400
Subject: [PATCH] updated char replacer to support hex colors, and escaping &x

---
 .../replacer/CharsReplacer.java               | 43 +++++++++++++++++--
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/main/java/me/clip/placeholderapi/replacer/CharsReplacer.java b/src/main/java/me/clip/placeholderapi/replacer/CharsReplacer.java
index 395c875..db9f6d8 100644
--- a/src/main/java/me/clip/placeholderapi/replacer/CharsReplacer.java
+++ b/src/main/java/me/clip/placeholderapi/replacer/CharsReplacer.java
@@ -1,6 +1,7 @@
 package me.clip.placeholderapi.replacer;
 
 import me.clip.placeholderapi.PlaceholderHook;
+import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -34,15 +35,51 @@ public final class CharsReplacer implements Replacer
 
 			if (l == '&' && ++i < chars.length)
 			{
-				final char c = chars[i];
+				final char c = Character.toLowerCase(chars[i]);
 
 				if (c != '0' && c != '1' && c != '2' && c != '3' && c != '4' && c != '5' && c != '6' && c != '7' && c != '8' && c != '9' && c != 'a' && c != 'b' && c != 'c' && c != 'd' && c != 'e' && c != 'f' && c != 'k' && c != 'l' && c != 'm' && c != 'o' && c != 'r' && c != 'x')
 				{
-					builder.append(l).append(c);
+					builder.append(l).append(chars[i]);
 				}
 				else
 				{
-					builder.append('§').append(c);
+					builder.append(ChatColor.COLOR_CHAR);
+
+					if (c != 'x')
+					{
+						builder.append(chars[i]);
+						continue;
+					}
+
+					if ((i > 1 && chars[i - 2] == '\\') /*allow escaping &x*/)
+					{
+						builder.setLength(builder.length() - 2);
+						builder.append('&').append(chars[i]);
+						continue;
+					}
+
+					builder.append(c);
+
+					int j = 0;
+					while (++j <= 6)
+					{
+						if (i + j >= chars.length)
+						{
+							break;
+						}
+
+						final char x = chars[i + j];
+						builder.append(ChatColor.COLOR_CHAR).append(x);
+					}
+
+					if (j == 7)
+					{
+						i += 6;
+					}
+					else
+					{
+						builder.setLength(builder.length() - (j * 2)); // undo &x parsing
+					}
 				}
 				continue;
 			}