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
commit588b9f52692a0e3250777918a139913544ac3668 (patch)
treee3aa40046aebe9d2074358c116fe519b9a7c7ee3
parent5db484f72625726411d9dbe658a632f2c7b5d76c (diff)
downloadEssentials-588b9f52692a0e3250777918a139913544ac3668.tar
Essentials-588b9f52692a0e3250777918a139913544ac3668.tar.gz
Essentials-588b9f52692a0e3250777918a139913544ac3668.tar.lz
Essentials-588b9f52692a0e3250777918a139913544ac3668.tar.xz
Essentials-588b9f52692a0e3250777918a139913544ac3668.zip
Revert "Prevent replacement of { and } characters in chat.format"
This reverts commit d78a9051753dd8afcde8f9c82881cf66b7bdfe12.
-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);