icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #820 from altrisi/get-list

Browse Source 
Make `get()` always return a list if requested item ends with `[]`
This commit is contained in:
gnembon authored and GitHub committed 2021-04-21 01:43:42 -03:00
2 parents 72a3d74a97 6083b702f9
commit db15744737
1 file changed
+3 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/carpet/script/value/NBTSerializableValue.java
+3 -2
View File
@@ -569,13 +569,14 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa
@Override @Override
public Value get(Value value) public Value get(Value value)
{ {
NbtPathArgumentType.NbtPath path = cachePath(value.getString()); String valString = value.getString();
NbtPathArgumentType.NbtPath path = cachePath(valString);
try try
{ {
List<Tag> tags = path.get(getTag()); List<Tag> tags = path.get(getTag());
if (tags.size()==0) if (tags.size()==0)
return Value.NULL; return Value.NULL;
if (tags.size()==1) if (tags.size()==1 && !valString.endsWith("[]"))
return NBTSerializableValue.decodeTag(tags.get(0)); return NBTSerializableValue.decodeTag(tags.get(0));
return ListValue.wrap(tags.stream().map(NBTSerializableValue::decodeTag).collect(Collectors.toList())); return ListValue.wrap(tags.stream().map(NBTSerializableValue::decodeTag).collect(Collectors.toList()));
} }