summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2013-06-25 18:04:31 +0100
committerKHobbits <rob@khobbits.co.uk>2013-06-25 18:04:31 +0100
commit2f58929d60484c1df769e285eae6069e0ad32d79 (patch)
tree0f7314aa8b3ec6d5c2ab1109cacad4303d8652b2
parent79d070b5fcbc1dd6d6faa65d0f8090ee5f0eda97 (diff)
downloadEssentials-2f58929d60484c1df769e285eae6069e0ad32d79.tar
Essentials-2f58929d60484c1df769e285eae6069e0ad32d79.tar.gz
Essentials-2f58929d60484c1df769e285eae6069e0ad32d79.tar.lz
Essentials-2f58929d60484c1df769e285eae6069e0ad32d79.tar.xz
Essentials-2f58929d60484c1df769e285eae6069e0ad32d79.zip
Don't automatically convert {chatparms} to [chatparams]
-rw-r--r--Essentials/src/com/earth2me/essentials/Settings.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java
index 62a8e9813..e464362b6 100644
--- a/Essentials/src/com/earth2me/essentials/Settings.java
+++ b/Essentials/src/com/earth2me/essentials/Settings.java
@@ -413,12 +413,13 @@ public class Settings implements ISettings
String format = config.getString("chat.group-formats." + (group == null ? "Default" : group),
config.getString("chat.format", "&7[{GROUP}]&r {DISPLAYNAME}&7:&r {MESSAGE}"));
format = FormatUtil.replaceFormat(format);
+ format = format.replace("'", "''");
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("\\{(\\D*?)\\}", "\\[$1\\]");
+ format = format.replaceAll("\\{(\\D*?)\\}", "'\\{$1\\}'");
format = "§r".concat(format);
mFormat = new MessageFormat(format);
chatFormats.put(group, mFormat);