ChromaGaming/Chroma-Chat
1
0
Fork 0
Code Issues 15 Pull requests 1 Projects Releases 8 Packages Wiki Activity

Almost fixed #46

Browse source
This commit is contained in:
Norbi Peti 2016-09-24 18:20:12 +02:00
parent bda72749cd
commit 9edc49a4a0
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pom.xml
View file

@ -115,12 +115,6 @@
</repository> --> </repository> -->
</repositories> </repositories>
<dependencies> <dependencies>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>0.9.10</version>
<scope>runtime</scope>
</dependency>
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId> <artifactId>spigot-api</artifactId>

17
src/main/java/buttondevteam/chat/formatting/ChatFormatter.java
View file

@ -49,8 +49,8 @@ public final class ChatFormatter {
FormattedSection section = new FormattedSection(formatter, matcher.start(), matcher.end() - 1, groups); FormattedSection section = new FormattedSection(formatter, matcher.start(), matcher.end() - 1, groups);
sections.add(section); sections.add(section);
if (formatter.removecharcount != 0) { if (formatter.removecharcount != 0) {
removecharpositions.add(section.Start + formatter.removecharcount); removecharpositions.add(section.Start + formatter.removecharcount - 1);
removecharpositions.add(section.End - formatter.removecharcount); removecharpositions.add(section.End - formatter.removecharcount - 1);
} }
if (formatter.removecharpos != -1) if (formatter.removecharpos != -1)
removecharpositions.add(section.Start + (int) formatter.removecharpos); removecharpositions.add(section.Start + (int) formatter.removecharpos);
@ -133,6 +133,7 @@ public final class ChatFormatter {
} }
} }
int nextremcharpospos = 0; int nextremcharpospos = 0;
DebugCommand.SendDebugMessage("RemoveCharPositions size: " + removecharpositions.size());
for (int i = 0; i < sections.size(); i++) { for (int i = 0; i < sections.size(); i++) {
FormattedSection section = sections.get(i); FormattedSection section = sections.get(i);
DebugCommand.SendDebugMessage("Applying section: " + section); DebugCommand.SendDebugMessage("Applying section: " + section);
@ -141,12 +142,18 @@ public final class ChatFormatter {
nextremcharpos = removecharpositions.get(nextremcharpospos); nextremcharpos = removecharpositions.get(nextremcharpospos);
String originaltext; String originaltext;
int start = section.Start, end = section.End + 1; int start = section.Start, end = section.End + 1;
if (nextremcharpos == section.Start) DebugCommand.SendDebugMessage("Next remove char pos: " + nextremcharpos);
if (nextremcharpos == section.Start) {
start++; start++;
if (nextremcharpos == section.End) nextremcharpospos++;
if (removecharpositions.size() > nextremcharpospos)
nextremcharpos = removecharpositions.get(nextremcharpospos); //TODO: Section.RemoveCharCountStart/End
}
if (nextremcharpos == section.End) {
end--; end--;
nextremcharpospos++;
}
originaltext = str.substring(start, end); originaltext = str.substring(start, end);
nextremcharpospos++;
DebugCommand.SendDebugMessage("Originaltext: " + originaltext); DebugCommand.SendDebugMessage("Originaltext: " + originaltext);
Color color = null; Color color = null;
Format format = null; Format format = null;