Skip to content

Prevent replacement of {\d+} sequences in chat.format and remove stray ' #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zford wants to merge 1 commit into from
Closed

Prevent replacement of {\d+} sequences in chat.format and remove stray ' #285

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Essentials/src/com/earth2me/essentials/Settings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,13 +410,15 @@ public MessageFormat getChatFormat(String group)
String format = config.getString("chat.group-formats." + (group == null ? "Default" : group),
config.getString("chat.format", "&7[{GROUP}]&f {DISPLAYNAME}&7:&f {MESSAGE}"));
format = Util.replaceFormat(format);
format = format.replaceAll("'", "''"); // escape quotes
format = format.replaceAll("\\{(\\d+)\\}", "'{'$1'}'"); // quote {\d+} sequences
format = format.replace("{DISPLAYNAME}", "%1$s");
format = format.replace("{GROUP}", "{0}");
format = format.replace("{MESSAGE}", "%2$s");
format = format.replace("{WORLDNAME}", "{1}");
format = format.replace("{SHORTWORLDNAME}", "{2}");
format = format.replaceAll("'", "''");
format = format.replaceAll("\\{(\\D*?)\\}", "\\'{$1\\}'");
format = format.replaceAll("(?:^|(?<=[^\\d'])|(?<=\\d'\\}'))([{}][{}']*)(?:$|(?=[^\\d'])|(?<='\\{'\\d))", "'$1'"); // quote the rest of the braces
format = format.replaceAll("'([}{])''('*)([}{])'", "'$1$2$3'"); // cleanup extra ''
format = "§r".concat(format);
mFormat = new MessageFormat(format);
chatFormats.put(group, mFormat);
Expand Down