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

Properly added a bug as a feature

Browse source 
Wth did I just do before - Anyways, fixed null nicknames
This commit is contained in:
Norbi Peti 2016-12-16 21:25:13 +01:00
parent 845f3e1f16
commit a3b3af859a
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/buttondevteam/chat/ChatProcessing.java
View file

@ -122,11 +122,17 @@ public class ChatProcessing {
namesb.append(")"); namesb.append(")");
StringBuilder nicksb = new StringBuilder(); StringBuilder nicksb = new StringBuilder();
nicksb.append("(?i)("); nicksb.append("(?i)(");
for (Player p : PluginMain.GetPlayers()) for (Player p : PluginMain.GetPlayers()) {
nicksb.append(PlayerListener.nicknames.inverse().get(p.getUniqueId())).append("|"); final String nick = PlayerListener.nicknames.inverse().get(p.getUniqueId());
if (nick != null) // Not everyone has a nickname
nicksb.append(nick).append("|");
}
nicksb.deleteCharAt(nicksb.length() - 1); nicksb.deleteCharAt(nicksb.length() - 1);
nicksb.append(")"); nicksb.append(")");
formatters
.add(new ChatFormatterBuilder().setRegex(Pattern.compile("null")).setColor(Color.DarkRed).build()); // Properly added a bug as a feature
formatters.add(new ChatFormatterBuilder().setRegex(Pattern.compile(namesb.toString())).setColor(Color.Aqua) formatters.add(new ChatFormatterBuilder().setRegex(Pattern.compile(namesb.toString())).setColor(Color.Aqua)
.setOnmatch((String match) -> { .setOnmatch((String match) -> {
Player p = Bukkit.getPlayer(match); Player p = Bukkit.getPlayer(match);

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

@ -164,11 +164,8 @@ public final class ChatFormatter {
section.Formatters.sort((cf2, cf1) -> cf1.priority.compareTo(cf2.priority)); section.Formatters.sort((cf2, cf1) -> cf1.priority.compareTo(cf2.priority));
for (ChatFormatter formatter : section.Formatters) { for (ChatFormatter formatter : section.Formatters) {
DebugCommand.SendDebugMessage("Applying formatter: " + formatter); DebugCommand.SendDebugMessage("Applying formatter: " + formatter);
if (formatter.onmatch != null) { if (formatter.onmatch != null)
String f = formatter.onmatch.apply(originaltext); originaltext = formatter.onmatch.apply(originaltext);
if (f != null)
originaltext = f; //TODO: Find out...
}
if (formatter.color != null) if (formatter.color != null)
color = formatter.color; color = formatter.color;
if (formatter.format != null) if (formatter.format != null)