summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZak Ford <zak.j.ford@gmail.com>2013-01-24 11:43:10 -0500
committerZak Ford <zak.j.ford@gmail.com>2013-01-24 11:43:10 -0500
commitd78a9051753dd8afcde8f9c82881cf66b7bdfe12 (patch)
tree52d6af61003462552042170f6859c6960a6e35c3
parentd809e13837a5d17f5cf570297f36f94307bb529f (diff)
downloadEssentials-d78a9051753dd8afcde8f9c82881cf66b7bdfe12.tar
Essentials-d78a9051753dd8afcde8f9c82881cf66b7bdfe12.tar.gz
Essentials-d78a9051753dd8afcde8f9c82881cf66b7bdfe12.tar.lz
Essentials-d78a9051753dd8afcde8f9c82881cf66b7bdfe12.tar.xz
Essentials-d78a9051753dd8afcde8f9c82881cf66b7bdfe12.zip
Prevent replacement of { and } characters in chat.format
-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 95123d051..b88ba9e63 100644
--- a/Essentials/src/com/earth2me/essentials/Settings.java
+++ b/Essentials/src/com/earth2me/essentials/Settings.java
@@ -415,7 +415,8 @@ public class Settings implements ISettings
format = format.replace("{MESSAGE}", "%2$s");
format = format.replace("{WORLDNAME}", "{1}");
format = format.replace("{SHORTWORLDNAME}", "{2}");
- format = format.replaceAll("\\{(\\D*?)\\}", "\\[$1\\]");
+ format = format.replaceAll("'", "''");
+ format = format.replaceAll("\\{(\\D*?)\\}", "\\'{$1\\}'");
format = "§r".concat(format);
mFormat = new MessageFormat(format);
chatFormats.put(group, mFormat);