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

Merge branch 'master' into unpacker

Browse Source
This commit is contained in:
gnembon committed 2021-04-22 20:37:57 -03:00
2 parents 74bd0bb81e 8c9dabdbbc
commit 77fbb3af75
3 files changed
+5 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gradle.properties
+1 -1
View File
@@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx1G
fabric_version=0.29.4+1.16 fabric_version=0.29.4+1.16
# Mod Properties # Mod Properties
mod_version = 1.4.32 mod_version = 1.4.33
maven_group = carpet maven_group = carpet
archives_base_name = fabric-carpet archives_base_name = fabric-carpet
src/main/java/carpet/CarpetSettings.java
+1 -1
View File
@@ -42,7 +42,7 @@ import static carpet.settings.RuleCategory.CLIENT;
@SuppressWarnings("CanBeFinal") @SuppressWarnings("CanBeFinal")
public class CarpetSettings 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 final Logger LOG = LogManager.getLogger("carpet");
public static boolean skipGenerationChecks = false; public static boolean skipGenerationChecks = false;
public static boolean impendingFillSkipUpdates = false; public static boolean impendingFillSkipUpdates = false;
src/main/java/carpet/script/value/NBTSerializableValue.java
+3 -2
View File
@@ -575,13 +575,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()));
} }