Merge branch 'master' into unpacker

gradle.properties

@@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx1G
 	fabric_version=0.29.4+1.16
 
 # Mod Properties
-	mod_version = 1.4.32
+	mod_version = 1.4.33
 	maven_group = carpet
 	archives_base_name = fabric-carpet
 

src/main/java/carpet/CarpetSettings.java

@@ -42,7 +42,7 @@ import static carpet.settings.RuleCategory.CLIENT;
 @SuppressWarnings("CanBeFinal")
 public class CarpetSettings
 {
-    public static final String carpetVersion = "1.4.32+v210414";
+    public static final String carpetVersion = "1.4.33+v210421";
     public static final Logger LOG = LogManager.getLogger("carpet");
     public static boolean skipGenerationChecks = false;
     public static boolean impendingFillSkipUpdates = false;

src/main/java/carpet/script/value/NBTSerializableValue.java

@@ -575,13 +575,14 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa
     @Override
     public Value get(Value value)
     {
-        NbtPathArgumentType.NbtPath path = cachePath(value.getString());
+        String valString = value.getString();
+        NbtPathArgumentType.NbtPath path = cachePath(valString);
         try
         {
             List<Tag> tags = path.get(getTag());
             if (tags.size()==0)
                 return Value.NULL;
-            if (tags.size()==1)
+            if (tags.size()==1 && !valString.endsWith("[]"))
                 return NBTSerializableValue.decodeTag(tags.get(0));
             return ListValue.wrap(tags.stream().map(NBTSerializableValue::decodeTag).collect(Collectors.toList()));
         }