From 9edc49a4a0b518f8ac6a69d8e4ef35c21ff19043 Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Sat, 24 Sep 2016 18:20:12 +0200
Subject: [PATCH] Almost fixed #46

---
 pom.xml                                         |  6 ------
 .../chat/formatting/ChatFormatter.java          | 17 ++++++++++++-----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 106e760..8bbeeb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,12 +115,6 @@
 			</repository> -->
 	</repositories>
 	<dependencies>
-		<dependency>
-			<groupId>org.reflections</groupId>
-			<artifactId>reflections</artifactId>
-			<version>0.9.10</version>
-			<scope>runtime</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
diff --git a/src/main/java/buttondevteam/chat/formatting/ChatFormatter.java b/src/main/java/buttondevteam/chat/formatting/ChatFormatter.java
index f0e6fe4..2dc40f1 100644
--- a/src/main/java/buttondevteam/chat/formatting/ChatFormatter.java
+++ b/src/main/java/buttondevteam/chat/formatting/ChatFormatter.java
@@ -49,8 +49,8 @@ public final class ChatFormatter {
 				FormattedSection section = new FormattedSection(formatter, matcher.start(), matcher.end() - 1, groups);
 				sections.add(section);
 				if (formatter.removecharcount != 0) {
-					removecharpositions.add(section.Start + formatter.removecharcount);
-					removecharpositions.add(section.End - formatter.removecharcount);
+					removecharpositions.add(section.Start + formatter.removecharcount - 1);
+					removecharpositions.add(section.End - formatter.removecharcount - 1);
 				}
 				if (formatter.removecharpos != -1)
 					removecharpositions.add(section.Start + (int) formatter.removecharpos);
@@ -133,6 +133,7 @@ public final class ChatFormatter {
 			}
 		}
 		int nextremcharpospos = 0;
+		DebugCommand.SendDebugMessage("RemoveCharPositions size: " + removecharpositions.size());
 		for (int i = 0; i < sections.size(); i++) {
 			FormattedSection section = sections.get(i);
 			DebugCommand.SendDebugMessage("Applying section: " + section);
@@ -141,12 +142,18 @@ public final class ChatFormatter {
 				nextremcharpos = removecharpositions.get(nextremcharpospos);
 			String originaltext;
 			int start = section.Start, end = section.End + 1;
-			if (nextremcharpos == section.Start)
+			DebugCommand.SendDebugMessage("Next remove char pos: " + nextremcharpos);
+			if (nextremcharpos == section.Start) {
 				start++;
-			if (nextremcharpos == section.End)
+				nextremcharpospos++;
+				if (removecharpositions.size() > nextremcharpospos)
+					nextremcharpos = removecharpositions.get(nextremcharpospos); //TODO: Section.RemoveCharCountStart/End
+			}
+			if (nextremcharpos == section.End) {
 				end--;
+				nextremcharpospos++;
+			}
 			originaltext = str.substring(start, end);
-			nextremcharpospos++;
 			DebugCommand.SendDebugMessage("Originaltext: " + originaltext);
 			Color color = null;
 			Format format = null;