From c69c78f15c6f8344673a7c1353633ed3983a39bc Mon Sep 17 00:00:00 2001
From: KHobbits <rob@khobbits.co.uk>
Date: Tue, 25 Jun 2013 18:04:31 +0100
Subject: [PATCH] Don't automatically convert {chatparms} to [chatparams]

---
 Essentials/src/com/earth2me/essentials/Settings.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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);