Merge branch 'master' into 1.15

This commit is contained in:
gnembon committed 2019-11-07 01:11:51 -04:00
commit 947e53d770
8 files changed
+111 -38

No files matched your search

@@ -95,11 +95,26 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa
return value;
}
@Override
public Value clone()
{
return new NBTSerializableValue(getTag().copy());
// sets only nbttag, even if emtpy;
NBTSerializableValue copy = new NBTSerializableValue(nbtTag);
copy.nbtSupplier = this.nbtSupplier;
copy.nbtString = this.nbtString;
return copy;
}
@Override
public Value deepcopy()
{
NBTSerializableValue copy = (NBTSerializableValue) clone();
// same fields except when tag is set - need to copy it.
if (copy.nbtTag != null)
copy.nbtTag = copy.getTag().copy();
return copy;
}
public static InventoryLocator locateInventory(CarpetContext c, List<LazyValue> params, int offset)
{