Merge branch 'master' into 1.17
# Conflicts: # gradle.properties # src/main/java/carpet/script/value/ValueConversions.java
This commit is contained in:
commit
973dd29739
17 files changed
+293
-21
No files matched your search
@@ -808,9 +808,7 @@ public class WorldAccess {
|
||||
tag = ((NBTSerializableValue) tagValue).getCompoundTag();
|
||||
else
|
||||
{
|
||||
NBTSerializableValue readTag = NBTSerializableValue.parseString(tagValue.getString());
|
||||
if (readTag == null)
|
||||
throw new InternalExpressionException("Incorrect tag: "+tagValue.getString());
|
||||
NBTSerializableValue readTag = NBTSerializableValue.parseString(tagValue.getString(), true);
|
||||
tag = readTag.getCompoundTag();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user