From cd1e56c803ff4d94e80cbd48ab29946ecb2c3207 Mon Sep 17 00:00:00 2001
From: Ilya Andreev <mrbrikster@yandex.ru>
Date: Sat, 21 Sep 2024 21:05:16 +0300
Subject: [PATCH] Do not allow terribly stupid hex format by default without
 permission

---
 .../transform/decorations/PlayerDecorationsFormatter.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/spigot/src/main/java/ru/brikster/chatty/chat/message/transform/decorations/PlayerDecorationsFormatter.java b/spigot/src/main/java/ru/brikster/chatty/chat/message/transform/decorations/PlayerDecorationsFormatter.java
index 998485b..0976b53 100644
--- a/spigot/src/main/java/ru/brikster/chatty/chat/message/transform/decorations/PlayerDecorationsFormatter.java
+++ b/spigot/src/main/java/ru/brikster/chatty/chat/message/transform/decorations/PlayerDecorationsFormatter.java
@@ -78,8 +78,11 @@ public final class PlayerDecorationsFormatter {
             }
         }
 
+        String messageToDeserialize = message;
+
         if (!sender.hasPermission("chatty.decoration.hex")) {
             componentSerializerBuilder.hexCharacter((char) 0);
+            messageToDeserialize = message.replaceAll("&[xX](&[a-fA-F0-9]){6}", "");
         } else {
             componentSerializerBuilder.hexColors();
         }
@@ -88,7 +91,7 @@ public final class PlayerDecorationsFormatter {
 
         return componentSerializerBuilder
                 .build()
-                .deserialize(message);
+                .deserialize(messageToDeserialize);
     }
 
 }