fix chat script event determines

DenizenScript · Mar 21, 2019 · 6972f3f · 6972f3f
1 parent 15e6b3f
commit 6972f3f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/Denizen.java b/plugin/src/main/java/net/aufdemrand/denizen/Denizen.java
@@ -1257,11 +1257,8 @@ public boolean onCommand(CommandSender sender, Command cmd, String cmdName, Stri
         // -->
 
         if (cmdName.equalsIgnoreCase("ex")) {
-            List<Object> entries = new ArrayList<Object>();
-            String entry = "";
-            for (String arg : args) {
-                entry = entry + arg + " ";
-            }
+            List<Object> entries = new ArrayList<>();
+            String entry = String.join(" ", args);
 
             if (entry.length() < 2) {
                 sender.sendMessage("/ex <dCommand> (arguments)");

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/ChatScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/ChatScriptEvent.java
@@ -101,7 +101,7 @@ public void init() {
     public boolean applyDetermination(ScriptContainer container, String determination) {
         String lower = CoreUtilities.toLowerCase(determination);
         if (lower.startsWith("format:")) {
-            String name = determination.substring(7);
+            String name = determination.substring("format:".length());
             FormatScriptContainer formatscr = ScriptRegistry.getScriptContainer(name);
             if (formatscr == null) {
                 dB.echoError("Could not find format script matching '" + name + '\'');
@@ -114,12 +114,12 @@ public boolean applyDetermination(ScriptContainer container, String determinatio
                 format = new Element(formatstr);
             }
         }
-        else if (lower.startsWith("raw_format")) {
-            String form = determination.substring("raw_format".length());
+        else if (lower.startsWith("raw_format:")) {
+            String form = determination.substring("raw_format:".length());
             format = new Element(form);
         }
         else if (lower.startsWith("recipients:")) {
-            String rec_new = determination.substring(11);
+            String rec_new = determination.substring("recipients:".length());
             dList recs = dList.valueOf(rec_new);
             List<dPlayer> players = recs.filter(dPlayer.class, container);
             recipients.clear();