Actually fix chat event failures

DenizenScript · Mar 6, 2015 · be5fcb7 · be5fcb7
1 parent db7384d
commit be5fcb7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/events/core/AsyncChatSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/AsyncChatSmartEvent.java
@@ -114,7 +114,9 @@ else if (determination.toUpperCase().startsWith("FORMAT:")) {
                 String name = determination.substring(7);
                 FormatScriptContainer format = ScriptRegistry.getScriptContainer(name);
                 if (format == null) dB.echoError("Could not find format script matching '" + name + '\'');
-                else event.setFormat(EscapeTags.unEscape(format.getFormattedText(EscapeTags.Escape(event.getMessage()), null, player)));
+                else event.setFormat(format.getFormattedText(event.getMessage()
+                        .replace("&", "&amp").replace("%", "&pc"), null, player)
+                        .replace("&pc", "%").replace("&amp", "&"));
             } else if (!determination.equals("none")) {
                 event.setMessage(determination);
             }

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/SyncChatSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/SyncChatSmartEvent.java
@@ -108,7 +108,9 @@ else if (determination.toUpperCase().startsWith("FORMAT:")) {
             String name = determination.substring(7);
             FormatScriptContainer format = ScriptRegistry.getScriptContainer(name);
             if (format == null) dB.echoError("Could not find format script matching '" + name + '\'');
-            else event.setFormat(EscapeTags.unEscape(format.getFormattedText(EscapeTags.Escape(event.getMessage()), null, player)));
+            else event.setFormat(format.getFormattedText(event.getMessage()
+                    .replace("&", "&amp").replace("%", "&pc"), null, player)
+                    .replace("&pc", "%").replace("&amp", "&"));
         }
         else if (!determination.equals("none")) {
             event.setMessage(determination);