Support new context engine

DenizenScript · Jul 18, 2015 · 3c95909 · 3c95909
1 parent 0f37621
commit 3c95909
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 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
@@ -6,6 +6,7 @@
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizen.scripts.containers.core.AssignmentScriptContainer;
 import net.aufdemrand.denizen.utilities.debugging.dB;
+import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.objects.aH;
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.scripts.ScriptBuilder;
@@ -65,9 +66,9 @@ public String doAction(String actionName, dNPC npc, dPlayer player, AssignmentSc
         ScriptQueue queue = InstantQueue.getQueue(ScriptQueue.getNextId(assignment.getName())).addEntries(script);
 
         if (context != null) {
-            for (Map.Entry<String, dObject> entry : context.entrySet()) {
-                queue.addContext(entry.getKey(), entry.getValue());
-            }
+            OldEventManager.OldEventContextSource oecs = new OldEventManager.OldEventContextSource();
+            oecs.contexts = context;
+            queue.setContextSource(oecs);
         }
 
         // Start the queue!

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/CommandScriptContainer.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/CommandScriptContainer.java
@@ -5,6 +5,7 @@
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizen.tags.BukkitTagContext;
 import net.aufdemrand.denizen.utilities.DenizenCommand;
+import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.objects.dList;
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.objects.dScript;
@@ -149,9 +150,9 @@ public ScriptQueue runCommandScript(dPlayer player, dNPC npc, Map<String, dObjec
         ScriptQueue queue = InstantQueue.getQueue(ScriptQueue.getNextId(getName())).addEntries(getBaseEntries(
                 new BukkitScriptEntryData(player, npc)));
         if (context != null) {
-            for (Map.Entry<String, dObject> entry : context.entrySet()) {
-                queue.addContext(entry.getKey(), entry.getValue());
-            }
+            OldEventManager.OldEventContextSource oecs = new OldEventManager.OldEventContextSource();
+            oecs.contexts = context;
+            queue.setContextSource(oecs);
         }
         queue.start();
         return queue;
@@ -165,9 +166,9 @@ public boolean runAllowedHelpProcedure(dPlayer player, dNPC npc, Map<String, dOb
 
         ScriptQueue queue = InstantQueue.getQueue(ScriptQueue.getNextId(getName())).setReqId(id).addEntries(entries);
         if (context != null) {
-            for (Map.Entry<String, dObject> entry : context.entrySet()) {
-                queue.addContext(entry.getKey(), entry.getValue());
-            }
+            OldEventManager.OldEventContextSource oecs = new OldEventManager.OldEventContextSource();
+            oecs.contexts = context;
+            queue.setContextSource(oecs);
         }
         queue.start();
         return DetermineCommand.hasOutcome(id) && DetermineCommand.getOutcome(id).get(0).equalsIgnoreCase("true");
@@ -181,9 +182,9 @@ public List<String> runTabCompleteProcedure(dPlayer player, dNPC npc, Map<String
 
         ScriptQueue queue = InstantQueue.getQueue(ScriptQueue.getNextId(getName())).setReqId(id).addEntries(entries);
         if (context != null) {
-            for (Map.Entry<String, dObject> entry : context.entrySet()) {
-                queue.addContext(entry.getKey(), entry.getValue());
-            }
+            OldEventManager.OldEventContextSource oecs = new OldEventManager.OldEventContextSource();
+            oecs.contexts = context;
+            queue.setContextSource(oecs);
         }
         queue.start();
         if (DetermineCommand.hasOutcome(id))

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/triggers/AbstractTrigger.java b/src/main/java/net/aufdemrand/denizen/scripts/triggers/AbstractTrigger.java
@@ -6,6 +6,7 @@
 import net.aufdemrand.denizen.scripts.containers.core.InteractScriptContainer;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.debugging.dB;
+import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.interfaces.RegistrationableInstance;
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.scripts.ScriptEntry;
@@ -98,9 +99,9 @@ public boolean parse(dNPC npc, dPlayer player, InteractScriptContainer script, S
         queue.addEntries(entries);
         // Add context
         if (context != null) {
-            for (Map.Entry<String, dObject> entry : context.entrySet()) {
-                queue.addContext(entry.getKey(), entry.getValue());
-            }
+            OldEventManager.OldEventContextSource oecs = new OldEventManager.OldEventContextSource();
+            oecs.contexts = context;
+            queue.setContextSource(oecs);
         }
         // Start it
         queue.start();