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

Mostly fixed chat formatting #60

Merged
NorbiPeti merged 11 commits from dev into master 2016-12-30 21:54:03 +00:00
Conversation 0 Commits 11 Files changed 4 +10 -7
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit eba73d6db4 - Show all commits

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

@ -71,15 +71,18 @@ public final class ChatFormatter {
// Set ending to -1 until closed with another 1 long "section" - only do this if IsRange is true // Set ending to -1 until closed with another 1 long "section" - only do this if IsRange is true
final FormattedSection section = sections.get(i); final FormattedSection section = sections.get(i);
if (!section.IsRange) { if (!section.IsRange) {
escaped = section.Formatters.contains(ChatProcessing.ESCAPE_FORMATTER); escaped = section.Formatters.contains(ChatProcessing.ESCAPE_FORMATTER) && !escaped; // Enable escaping on first \, disable on second
combined.add(section); combined.add(section);
continue; // TODO: Escape \ and check and fix escape logic continue;
} // TODO: Actually combine overlapping sections } // TODO: Actually combine overlapping sections
if (nextSection.containsKey(section.Formatters.get(0)) && !escaped) { if (nextSection.containsKey(section.Formatters.get(0))) {
FormattedSection s = nextSection.remove(section.Formatters.get(0)); if (!escaped) {
DebugCommand.SendDebugMessage("Finishing section: " + s); FormattedSection s = nextSection.remove(section.Formatters.get(0));
s.End = section.Start; s.End = section.Start;
combined.add(s); combined.add(s);
DebugCommand.SendDebugMessage("Finished section: " + s);
} else
escaped = false; // Reset escaping if applied, like if we're at the '*' in '\*'
} else { } else {
DebugCommand.SendDebugMessage("Adding next section: " + section); DebugCommand.SendDebugMessage("Adding next section: " + section);
nextSection.put(section.Formatters.get(0), section); nextSection.put(section.Formatters.get(0), section);