recognize yaml config as a map in object convert

DenizenScript · Dec 15, 2020 · 701656c · 701656c
1 parent b261117
commit 701656c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/com/denizenscript/denizencore/tags/Attribute.java b/src/main/java/com/denizenscript/denizencore/tags/Attribute.java
@@ -364,7 +364,6 @@ public long getLongContext(int attribute) {
                 Debug.echoError("Tag <" + toString() + "> has invalid input - expected a number, got '" + getContext(attribute) + "'...: " + ex.getMessage());
             }
         }
-
         return 0;
     }
 
@@ -379,7 +378,6 @@ public int getIntContext(int attribute) {
                 Debug.echoError("Tag <" + toString() + "> has invalid input - expected a number, got '" + getContext(attribute) + "'...: " + ex.getMessage());
             }
         }
-
         return 0;
     }
 

diff --git a/src/main/java/com/denizenscript/denizencore/utilities/CoreUtilities.java b/src/main/java/com/denizenscript/denizencore/utilities/CoreUtilities.java
@@ -52,7 +52,10 @@ public static ObjectTag objectToTagForm(Object obj, TagContext context, boolean
         if (obj == null) {
             return new ElementTag("null");
         }
-        else if (obj instanceof List) {
+        if (obj instanceof YamlConfiguration) {
+            obj = ((YamlConfiguration) obj).contents;
+        }
+        if (obj instanceof List) {
             ListTag listResult = new ListTag();
             for (Object subObj : (List) obj) {
                 listResult.addObject(objectToTagForm(subObj, context, scriptStrip, doParse));