Mostly fixed chat formatting #60

Merged
NorbiPeti merged 11 commits from dev into master 2016-12-30 21:54:03 +00:00
2 changed files with 2 additions and 3 deletions
Showing only changes of commit 7de0ecc87d - Show all commits

View file

@ -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() {
}

View file

@ -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));