From 7de0ecc87d5d741219cba581629ddf9e2c5286c7 Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Fri, 30 Dec 2016 21:50:53 +0100
Subject: [PATCH] Fixed small bug - SHRUG WORKS

---
 src/main/java/buttondevteam/chat/ChatProcessing.java           | 3 +--
 src/main/java/buttondevteam/chat/formatting/ChatFormatter.java | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/buttondevteam/chat/ChatProcessing.java b/src/main/java/buttondevteam/chat/ChatProcessing.java
index c795b7c..9532163 100644
--- a/src/main/java/buttondevteam/chat/ChatProcessing.java
+++ b/src/main/java/buttondevteam/chat/ChatProcessing.java
@@ -44,8 +44,7 @@ public class ChatProcessing {
 
 	private static ArrayList<ChatFormatter> commonFormatters = new ArrayList<>();
 
-	public static final ChatFormatter ESCAPE_FORMATTER = new ChatFormatterBuilder().setRegex(ESCAPE_PATTERN)
-			.setRemoveCharPos((short) 0).build();
+	public static final ChatFormatter ESCAPE_FORMATTER = new ChatFormatterBuilder().setRegex(ESCAPE_PATTERN).build();
 
 	private ChatProcessing() {
 	}
diff --git a/src/main/java/buttondevteam/chat/formatting/ChatFormatter.java b/src/main/java/buttondevteam/chat/formatting/ChatFormatter.java
index 7baf4ae..ce58598 100644
--- a/src/main/java/buttondevteam/chat/formatting/ChatFormatter.java
+++ b/src/main/java/buttondevteam/chat/formatting/ChatFormatter.java
@@ -77,7 +77,7 @@ public final class ChatFormatter {
 				combined.add(section);
 				DebugCommand.SendDebugMessage("Added " + (!escaped ? "not " : "") + "escaped section: " + section);
 				continue;
-			} // TODO: Actually combine overlapping sections
+			}
 			if (!escaped) {
 				if (nextSection.containsKey(section.Formatters.get(0))) {
 					FormattedSection s = nextSection.remove(section.Formatters.get(0));