update for new core

DenizenScript · Sep 20, 2019 · f6c39d5 · f6c39d5
1 parent f557bea
commit f6c39d5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/Denizen.java b/plugin/src/main/java/com/denizenscript/denizen/Denizen.java
@@ -13,6 +13,7 @@
 import com.denizenscript.denizen.scripts.containers.ContainerRegistry;
 import com.denizenscript.denizen.scripts.containers.core.*;
 import com.denizenscript.denizen.scripts.triggers.TriggerRegistry;
+import com.denizenscript.denizen.tags.BukkitTagContext;
 import com.denizenscript.denizen.tags.core.ServerTagBase;
 import com.denizenscript.denizen.utilities.*;
 import com.denizenscript.denizen.utilities.blocks.OldMaterialsHelper;
@@ -42,6 +43,7 @@
 import com.denizenscript.denizencore.scripts.commands.core.AdjustCommand;
 import com.denizenscript.denizencore.scripts.queues.core.InstantQueue;
 import com.denizenscript.denizencore.tags.TagManager;
+import com.denizenscript.denizencore.utilities.CoreUtilities;
 import com.denizenscript.denizencore.utilities.debugging.SlowWarning;
 import com.denizenscript.denizencore.utilities.text.ConfigUpdater;
 import org.bukkit.Bukkit;
@@ -137,6 +139,8 @@ public void onEnable() {
         try {
             versionTag = this.getDescription().getVersion();
 
+            CoreUtilities.noDebugContext = new BukkitTagContext(null, null, false, null, false, null);
+
             // Load Denizen's core
             DenizenCore.init(coreImplementation);
         }

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/notable/NotableManager.java b/plugin/src/main/java/com/denizenscript/denizen/objects/notable/NotableManager.java
@@ -2,7 +2,6 @@
 
 import com.denizenscript.denizen.objects.*;
 import com.denizenscript.denizen.utilities.DenizenAPI;
-import com.denizenscript.denizen.utilities.Utilities;
 import com.denizenscript.denizen.utilities.debugging.Debug;
 import com.denizenscript.denizencore.objects.ObjectFetcher;
 import com.denizenscript.denizencore.objects.ObjectTag;
@@ -148,7 +147,7 @@ private static void _recallNotables() {
 
             for (String notableRaw : section.getKeys(false)) {
                 String notable = EscapeTagBase.unEscape(notableRaw.replace("DOT", "."));
-                Notable obj = (Notable) ObjectFetcher.getObjectFrom(clazz, section.getString(notableRaw), Utilities.noDebugContext);
+                Notable obj = (Notable) ObjectFetcher.getObjectFrom(clazz, section.getString(notableRaw), CoreUtilities.noDebugContext);
                 if (obj != null) {
                     obj.makeUnique(notable);
                 }

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/Utilities.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/Utilities.java
@@ -11,7 +11,6 @@
 import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizen.tags.BukkitTagContext;
 import com.denizenscript.denizencore.scripts.ScriptEntry;
-import com.denizenscript.denizencore.tags.TagContext;
 import com.denizenscript.denizencore.tags.TagManager;
 import com.denizenscript.denizencore.utilities.CoreUtilities;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
@@ -36,8 +35,6 @@
  */
 public class Utilities {
 
-    public static final TagContext noDebugContext = new BukkitTagContext(null, null, false, null, false, null);
-
     public static NamespacedKey parseNamespacedKey(String input) {
         int colonIndex = input.indexOf(':');
         if (colonIndex != -1) {