Add raw_context to run command

DenizenScript · Aug 7, 2016 · a1d1b14 · a1d1b14
1 parent c92b425
commit a1d1b14
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RunCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RunCommand.java
@@ -115,7 +115,7 @@ else if (arg.matchesPrefix("a", "as")) {
             }
 
             else if (arg.matchesPrefix("d", "def", "define", "c", "context")) {
-                scriptEntry.addObject("definitions", arg.asType(dList.class));
+                scriptEntry.addObject("definitions", arg.asElement());
             }
 
             else if (arg.matches("instant", "instantly")) {
@@ -239,7 +239,8 @@ else if (scriptEntry.hasObject("path") && scriptEntry.getObject("path") != null)
         // Set any definitions
         if (scriptEntry.hasObject("definitions")) {
             int x = 1;
-            dList definitions = (dList) scriptEntry.getObject("definitions");
+            Element raw_defintions = scriptEntry.getElement("definitions");
+            dList definitions = dList.valueOf(raw_defintions.asString());
             String[] definition_names = null;
             try {
                 definition_names = script.getContainer().getString("definitions").split("\\|");
@@ -254,6 +255,7 @@ else if (scriptEntry.hasObject("path") && scriptEntry.getObject("path") != null)
                 dB.echoDebug(scriptEntry, "Adding definition %" + name + "% as " + definition);
                 x++;
             }
+            queue.addDefinition("raw_context", raw_defintions.asString());
         }