Pattern

LOOHP · Jul 5, 2020 · 586cba6 · 586cba6
1 parent d4f0c51
commit 586cba6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/com/loohp/interactivechat/Utils/ChatColorUtils.java b/src/com/loohp/interactivechat/Utils/ChatColorUtils.java
@@ -16,7 +16,7 @@ public class ChatColorUtils {
 
 	private static Set<Character> colors = new HashSet<Character>();
 	private static Pattern colorFormating = Pattern.compile("(?=(?<!\\\\)|(?<=\\\\\\\\))\\[[^\\]]*?color=#[0-9a-fA-F]{6}[^\\[]*?\\]");
-	private static Pattern colorEscape = Pattern.compile("\\\\\\[[^\\]]*?color=#[0-9a-fA-F]{6}[^\\[]*?\\]");
+	private static Pattern colorEscape = Pattern.compile("\\\\\\[ *?color=#[0-9a-fA-F]{6} *?\\]");
 
 	static {
 		colors.add('0');
@@ -215,11 +215,11 @@ public static String translatePluginColorFormatting(String text) {
 	    	    if (sb.charAt(absPos) == ']' && sb.charAt(absPos - 1) == '[') {
 	    	    	sb.deleteCharAt(absPos - 1);
 	    	    	sb.deleteCharAt(absPos - 1);
-	    	    }
-
-	    	    if (absPos > 2 && sb.charAt(absPos - 2) == '\\' && sb.charAt(absPos - 3) == '\\') {
-	    	    	sb.deleteCharAt(absPos - 2);
-	    	    }
+	    	    	
+	    	    	if (absPos > 2 && sb.charAt(absPos - 2) == '\\' && sb.charAt(absPos - 3) == '\\') {
+		    	    	sb.deleteCharAt(absPos - 2);
+		    	    }
+	    	    }	    	  
 
 	    	    text = sb.toString();	    	    
     		} else {

diff --git a/src/com/loohp/interactivechat/Utils/ChatComponentUtils.java b/src/com/loohp/interactivechat/Utils/ChatComponentUtils.java
@@ -35,7 +35,7 @@ public class ChatComponentUtils {
 	private static MethodHandle hoverEventGetValueMethod;
 
 	private static Pattern fontFormating = Pattern.compile("(?=(?<!\\\\)|(?<=\\\\\\\\))\\[[^\\]]*?font=[0-9a-zA-Z:_]*[^\\[]*?\\]");
-	private static Pattern fontEscape = Pattern.compile("\\\\\\[[^\\]]*?font=[0-9a-zA-Z:_]*[^\\[]*?\\]");
+	private static Pattern fontEscape = Pattern.compile("\\\\\\[ *?font=[0-9a-zA-Z:_]* *?\\]");
 
 	public static void setupLegacy() {
 		try {
@@ -441,14 +441,14 @@ public static BaseComponent translatePluginFontFormatting(BaseComponent basecomp
 
 			    	    if (sb.charAt(absPos) == ']' && sb.charAt(absPos - 1) == '[') {
 			    	    	sb.deleteCharAt(absPos - 1);
-			    	    	sb.deleteCharAt(absPos - 1);			    	    	
+			    	    	sb.deleteCharAt(absPos - 1);		
+
+			    	    	if (absPos > 2 && sb.charAt(absPos - 2) == '\\' && sb.charAt(absPos - 3) == '\\') {
+				    	    	sb.deleteCharAt(absPos - 2);
+				    	    	absPos--;
+				    	    }
 			    	    }			    	
 
-			    	    if (absPos > 2 && sb.charAt(absPos - 2) == '\\' && sb.charAt(absPos - 3) == '\\') {
-			    	    	sb.deleteCharAt(absPos - 2);
-			    	    	absPos--;
-			    	    }
-
 			    	    absPos--;
 
 			    	    TextComponent before = new TextComponent(textcomponent);