summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2013-01-25 03:12:13 +0000
committerKHobbits <rob@khobbits.co.uk>2013-01-25 03:12:13 +0000
commit2836c0862d6a8ecf29987439d57b75956d69dd74 (patch)
treefa35947c0371af7505724e23bb5618ab71c04f12
parent286091cd32fe5de8da9c2587769e6f4d305853ba (diff)
downloadEssentials-2836c0862d6a8ecf29987439d57b75956d69dd74.tar
Essentials-2836c0862d6a8ecf29987439d57b75956d69dd74.tar.gz
Essentials-2836c0862d6a8ecf29987439d57b75956d69dd74.tar.lz
Essentials-2836c0862d6a8ecf29987439d57b75956d69dd74.tar.xz
Essentials-2836c0862d6a8ecf29987439d57b75956d69dd74.zip
Revert "Prevent replacement of { and } characters in chat.format"
This reverts commit 8fde5102b9161cda2267d3638c15dc6fda48a7fd.
-rw-r--r--Essentials/src/com/earth2me/essentials/Settings.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java
index b88ba9e63..95123d051 100644
--- a/Essentials/src/com/earth2me/essentials/Settings.java
+++ b/Essentials/src/com/earth2me/essentials/Settings.java
@@ -415,8 +415,7 @@ public class Settings implements ISettings
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*?)\\}", "\\[$1\\]");
format = "§r".concat(format);
mFormat = new MessageFormat(format);
chatFormats.put(group, mFormat);