Reunbreak context and determine

The previous commit broke - DETERMINE for I don't know why. This unbreaks it.
DenizenScript · Aug 27, 2013 · ca4cb0f · ca4cb0f
1 parent 67acd0a
commit ca4cb0f
Show file tree

Hide file tree

Showing 3 changed files with 4 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
@@ -49,7 +49,7 @@ public boolean doAction(String actionName, dNPC npc, dPlayer player, AssignmentS
 
         if (context != null) {
             for (Map.Entry<String, Object> entry : context.entrySet()) {
-                ScriptBuilder.addObjectToEntries(script, entry.getKey(), entry.getValue());
+                ScriptBuilder.addObjectToEntries(script, "context_" + entry.getKey(), entry.getValue());
             }
         }
 

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/ScriptBuilder.java b/src/main/java/net/aufdemrand/denizen/scripts/ScriptBuilder.java
@@ -26,8 +26,8 @@ public class ScriptBuilder {
      */
     public static List<ScriptEntry> addObjectToEntries(List<ScriptEntry> scriptEntryList, String key, Object obj) {
         for (ScriptEntry entry : scriptEntryList) {
-            entry.addObject("context_" + key, obj);
-            entry.trackObject("context_" + key);
+            entry.addObject(key, obj);
+            entry.trackObject(key);
         }
         return scriptEntryList;
     }

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java
@@ -143,7 +143,7 @@ public static String doEvents(List<String> eventNames, dNPC npc, Player player,
 
                 if (context != null) {
                     for (Map.Entry<String, Object> entry : context.entrySet()) {
-                        ScriptBuilder.addObjectToEntries(entries, entry.getKey(), entry.getValue());
+                        ScriptBuilder.addObjectToEntries(entries, "context_" + entry.getKey(), entry.getValue());
                     }
                 }