Merge branch 'master' into 1.15

This commit is contained in:
gnembon committed 2020-01-28 12:23:11 -04:00
commit 00a540505e
5 files changed
+102 -1

No files matched your search

@@ -2292,7 +2292,9 @@ public class CarpetExpression
boolean hasTag = false;
if (lv.size() > position.offset)
{
NBTSerializableValue v = NBTSerializableValue.parseString(lv.get(position.offset).evalValue(c).getString());
Value nbt = lv.get(position.offset).evalValue(c);
NBTSerializableValue v = (nbt instanceof NBTSerializableValue) ? (NBTSerializableValue) nbt
: NBTSerializableValue.parseString(nbt.getString());
if (v != null)
{
hasTag = true;