Add context for Actions.

DenizenScript · Aug 10, 2013 · d701598 · d701598
1 parent a5bc81b
commit d701598
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/npc/actions/ActionHandler.java b/src/main/java/net/aufdemrand/denizen/npc/actions/ActionHandler.java
@@ -3,6 +3,7 @@
 import net.aufdemrand.denizen.Denizen;
 import net.aufdemrand.denizen.objects.dNPC;
 import net.aufdemrand.denizen.objects.dPlayer;
+import net.aufdemrand.denizen.scripts.ScriptBuilder;
 import net.aufdemrand.denizen.scripts.ScriptEntry;
 import net.aufdemrand.denizen.scripts.queues.ScriptQueue;
 import net.aufdemrand.denizen.scripts.containers.core.AssignmentScriptContainer;
@@ -12,6 +13,7 @@
 import net.aufdemrand.denizen.utilities.debugging.dB.DebugElement;
 
 import java.util.List;
+import java.util.Map;
 
 public class ActionHandler {
 
@@ -22,10 +24,13 @@ public ActionHandler(Denizen denizen) {
     }
 
     public boolean doAction(String actionName, dNPC npc, dPlayer player, AssignmentScriptContainer assignment) {
+        return doAction(actionName, npc, player, assignment, null);
+    }
 
+    public boolean doAction(String actionName, dNPC npc, dPlayer player, AssignmentScriptContainer assignment, Map<String, Object> context) {
         if (assignment == null) {
-        	// dB.echoDebug("Tried to do 'on " + actionName + ":' but couldn't find a matching script.");
-        	return false;
+            // dB.echoDebug("Tried to do 'on " + actionName + ":' but couldn't find a matching script.");
+            return false;
         }
 
         if (!assignment.contains("actions.on " + actionName)) return false;
@@ -42,6 +47,12 @@ public boolean doAction(String actionName, dNPC npc, dPlayer player, AssignmentS
 
         dB.echoDebug(DebugElement.Header, "Building action 'On " + actionName.toUpperCase() + "' for " + npc.toString());
 
+        if (context != null) {
+            for (Map.Entry<String, Object> entry : context.entrySet()) {
+                ScriptBuilder.addObjectToEntries(script, entry.getKey(), entry.getValue());
+            }
+        }
+
         ScriptQueue queue = InstantQueue.getQueue(null).addEntries(script);
         queue.start();
 

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dNPC.java b/src/main/java/net/aufdemrand/denizen/objects/dNPC.java
@@ -30,6 +30,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 public class dNPC implements dObject {
 
@@ -207,7 +208,7 @@ public TriggerTrait getTriggerTrait() {
         return getCitizen().getTrait(TriggerTrait.class);
     }
 
-    public void action(String actionName, dPlayer player) {
+    public void action(String actionName, dPlayer player, Map<String, Object> context) {
         if (getCitizen() != null)
         {
             if (getCitizen().hasTrait(AssignmentTrait.class))
@@ -216,10 +217,15 @@ public void action(String actionName, dPlayer player) {
                         actionName,
                         this,
                         player,
-                        getAssignmentTrait().getAssignment());
+                        getAssignmentTrait().getAssignment(),
+                        context);
         }
     }
 
+    public void action(String actionName, dPlayer player) {
+        action(actionName, player, null);
+    }
+
     private String prefix = "npc";
 
     @Override