From 42af3effd9fab0353a477a7f8e81f49e42ee1114 Mon Sep 17 00:00:00 2001
From: Alex 'mcmonkey' Goodwin <agoodwin@freneticllc.com>
Date: Sat, 15 Feb 2020 02:33:01 -0800
Subject: [PATCH] use new core context tracking improvement, also cleanup

---
 plugin/src/main/java/com/denizenscript/denizen/Denizen.java   | 2 +-
 .../utilities/implementation/DenizenCoreImplementation.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugin/src/main/java/com/denizenscript/denizen/Denizen.java b/plugin/src/main/java/com/denizenscript/denizen/Denizen.java
index 319f8e883f..a597b7c9f2 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/Denizen.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/Denizen.java
@@ -479,7 +479,7 @@ public void run() {
             public void run() {
                 if (!StrongWarning.recentWarnings.isEmpty()) {
                     StringBuilder warnText = new StringBuilder();
-                    warnText.append(ChatColor.YELLOW).append("[Denizen]").append(ChatColor.RED).append("Recent strong system warnings, scripters need to address ASAP (check earlier console logs for details):");
+                    warnText.append(ChatColor.YELLOW).append("[Denizen] ").append(ChatColor.RED).append("Recent strong system warnings, scripters need to address ASAP (check earlier console logs for details):");
                     for (StrongWarning warning : StrongWarning.recentWarnings) {
                         warnText.append("\n- ").append(warning.message);
                     }
diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java
index 629b025cd8..b3c5e1b93d 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java
@@ -192,7 +192,7 @@ public boolean handleCustomArgs(ScriptEntry scriptEntry, Argument arg, boolean i
         // Fill player/off-line player
         if (arg.matchesPrefix("player") && !if_ignore) {
             Debug.echoDebug(scriptEntry, "...replacing the linked player with " + arg.getValue());
-            String value = TagManager.tag(arg.getValue(), new BukkitTagContext(scriptEntry));
+            String value = TagManager.tag(arg.getValue(), scriptEntry.getContext());
             PlayerTag player = PlayerTag.valueOf(value);
             if (player == null || !player.isValid()) {
                 Debug.echoError(scriptEntry.getResidingQueue(), value + " is an invalid player!");
@@ -204,7 +204,7 @@ public boolean handleCustomArgs(ScriptEntry scriptEntry, Argument arg, boolean i
         // Fill NPC argument
         else if (arg.matchesPrefix("npc") && !if_ignore) {
             Debug.echoDebug(scriptEntry, "...replacing the linked NPC with " + arg.getValue());
-            String value = TagManager.tag(arg.getValue(), new BukkitTagContext(scriptEntry));
+            String value = TagManager.tag(arg.getValue(), scriptEntry.getContext());
             NPCTag npc = NPCTag.valueOf(value);
             if (npc == null || !npc.isValid()) {
                 Debug.echoError(scriptEntry.getResidingQueue(), value + " is an invalid NPC!");