From 67acd0a78e34d757772d02f8fe9276c00874c5f9 Mon Sep 17 00:00:00 2001
From: mcmonkey4eva <mcmonkey4eva@hotmail.com>
Date: Mon, 26 Aug 2013 21:29:12 -0700
Subject: [PATCH] Make context work less-disruptively

They should be their entirely own system, really... but this'll do for
now.
---
 .../java/net/aufdemrand/denizen/scripts/ScriptBuilder.java    | 4 ++--
 .../java/net/aufdemrand/denizen/tags/core/ContextTags.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/ScriptBuilder.java b/src/main/java/net/aufdemrand/denizen/scripts/ScriptBuilder.java
index cf86f08328..7ee4b7fde2 100644
--- 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(key, obj);
-            entry.trackObject(key);
+            entry.addObject("context_" + key, obj);
+            entry.trackObject("context_" + key);
         }
         return scriptEntryList;
     }
diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/ContextTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/ContextTags.java
index 33faae7521..cc8621b647 100644
--- a/src/main/java/net/aufdemrand/denizen/tags/core/ContextTags.java
+++ b/src/main/java/net/aufdemrand/denizen/tags/core/ContextTags.java
@@ -64,7 +64,7 @@ else if (type.equalsIgnoreCase("NAME")) {
     public void getContext(ReplaceableTagEvent event) {
         if (!event.matches("context, c") || event.getScriptEntry() == null) return;
 
-        String type = event.getType();
+        String type = "context_" + event.getType();
 
         // First check for entry object context
         if (event.getScriptEntry().hasObject(type)) {