Fix nickname regex bug
The previous implementation didn't consider tbe case when the last player in the list doesn't have a nickname, leaving an empty "always match" part which messed up the formatting @FigyTuna Also added editorconfig for GitHub formatting
This commit is contained in:
parent
720740dea3
commit
aed7864a15
2 changed files with 364 additions and 347 deletions
19
.editorconfig
Normal file
19
.editorconfig
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
[*]
|
||||||
|
charset = utf-8
|
||||||
|
end_of_line = lf
|
||||||
|
insert_final_newline = false
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 4
|
||||||
|
|
||||||
|
[*.json]
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 2
|
||||||
|
|
||||||
|
[*.java]
|
||||||
|
indent_style = tab
|
||||||
|
tab_width = 4
|
||||||
|
|
||||||
|
[{*.yml, *.yaml}]
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 2
|
||||||
|
|
|
@ -257,18 +257,16 @@ public class ChatProcessing {
|
||||||
namesb.append(")");
|
namesb.append(")");
|
||||||
StringBuilder nicksb = new StringBuilder("(?i)(");
|
StringBuilder nicksb = new StringBuilder("(?i)(");
|
||||||
boolean addNickFormatter = false;
|
boolean addNickFormatter = false;
|
||||||
final int size = Bukkit.getOnlinePlayers().size();
|
|
||||||
int index = 0;
|
int index = 0;
|
||||||
for (Player p : Bukkit.getOnlinePlayers()) {
|
for (Player p : Bukkit.getOnlinePlayers()) {
|
||||||
final String nick = PlayerListener.nicknames.inverse().get(p.getUniqueId());
|
final String nick = PlayerListener.nicknames.inverse().get(p.getUniqueId());
|
||||||
if (nick != null) {
|
if (nick != null) {
|
||||||
nicksb.append(nick);
|
nicksb.append(nick).append("|");
|
||||||
if (index < size - 1)
|
|
||||||
nicksb.append("|");
|
|
||||||
addNickFormatter = true; //Add it even if there's only 1 player online (it was in the if)
|
addNickFormatter = true; //Add it even if there's only 1 player online (it was in the if)
|
||||||
}
|
}
|
||||||
index++;
|
index++;
|
||||||
}
|
}
|
||||||
|
nicksb.deleteCharAt(nicksb.length() - 1);
|
||||||
nicksb.append(")");
|
nicksb.append(")");
|
||||||
|
|
||||||
Consumer<String> error = message -> {
|
Consumer<String> error = message -> {
|
||||||
|
|
Loading…
Reference in a new issue