Fix random character failure in chat events

DenizenScript · Mar 4, 2015 · 405173b · 405173b
1 parent 50802b4
commit 405173b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -154,15 +154,15 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-<minimizeJar>true</minimizeJar>
-<filters>
-<filter>
-<artifact>net.aufdemrand:denizencore</artifact>
-<includes>
-<include>**</include>
-</includes>
-</filter>
-</filters>
+                            <minimizeJar>true</minimizeJar>
+                            <filters>
+                                <filter>
+                                    <artifact>net.aufdemrand:denizencore</artifact>
+                                    <includes>
+                                        <include>**</include>
+                                    </includes>
+                                </filter>
+                            </filters>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/AsyncChatSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/AsyncChatSmartEvent.java
@@ -12,6 +12,7 @@
 import net.aufdemrand.denizen.scripts.containers.core.FormatScriptContainer;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.debugging.dB;
+import net.aufdemrand.denizencore.tags.core.EscapeTags;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -113,7 +114,7 @@ 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(format.getFormattedText(event.getMessage(), null, player));
+                else event.setFormat(EscapeTags.unEscape(format.getFormattedText(EscapeTags.Escape(event.getMessage()), null, player)));
             } 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
@@ -11,6 +11,7 @@
 import net.aufdemrand.denizen.scripts.containers.core.FormatScriptContainer;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.debugging.dB;
+import net.aufdemrand.denizencore.tags.core.EscapeTags;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerChatEvent;
@@ -107,7 +108,7 @@ 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(format.getFormattedText(event.getMessage(), null, player));
+            else event.setFormat(EscapeTags.unEscape(format.getFormattedText(EscapeTags.Escape(event.getMessage()), null, player)));
         }
         else if (!determination.equals("none")) {
             event.setMessage(determination);