update for core change

DenizenScript · Aug 2, 2022 · 3ccbd98 · 3ccbd98
1 parent 1338785
commit 3ccbd98
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java
@@ -1323,11 +1323,7 @@ public static void registerTags() {
             if (object.entityScript == null) {
                 return null;
             }
-            ScriptTag tag = new ScriptTag(object.entityScript);
-            if (tag.isValid()) {
-                return tag;
-            }
-            return null;
+            return ScriptTag.valueOf(object.entityScript, CoreUtilities.noDebugContext);
         });
 
         // <--[tag]
@@ -1353,7 +1349,7 @@ public static void registerTags() {
         registerSpawnedOnlyTag(ObjectTag.class, "custom_id", (attribute, object) -> {
             BukkitImplDeprecations.entityCustomIdTag.warn(attribute.context);
             if (CustomNBT.hasCustomNBT(object.getLivingEntity(), "denizen-script-id")) {
-                return new ScriptTag(CustomNBT.getCustomNBT(object.getLivingEntity(), "denizen-script-id"));
+                return ScriptTag.valueOf(CustomNBT.getCustomNBT(object.getLivingEntity(), "denizen-script-id"), CoreUtilities.noDebugContext);
             }
             else {
                 return new ElementTag(object.getBukkitEntity().getType().name());

diff --git a/...src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryHolder.java b/...src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryHolder.java
@@ -70,7 +70,7 @@ public static void registerTags() {
         PropertyParser.<InventoryHolder, ScriptTag>registerTag(ScriptTag.class, "script", (attribute, object) -> {
             ObjectTag holder = object.inventory.getIdHolder();
             if (holder instanceof ScriptTag) {
-                return (ScriptTag) holder;
+                return ((ScriptTag) holder).validate();
             }
             return null;
         });

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ClickableCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ClickableCommand.java
@@ -181,8 +181,8 @@ else if (!scriptEntry.hasObject("script")) {
                     scriptEntry.addObject("path", new ElementTag(scriptName.substring(dotIndex + 1)));
                     scriptName = scriptName.substring(0, dotIndex);
                 }
-                ScriptTag script = new ScriptTag(scriptName);
-                if (!script.isValid()) {
+                ScriptTag script = ScriptTag.valueOf(scriptName, CoreUtilities.noDebugContext);
+                if (script == null) {
                     arg.reportUnhandled();
                 }
                 else {