Merge branch 'master' into 1.15

This commit is contained in:
gnembon committed 2019-11-22 00:24:08 -04:00
commit aa8f5c1921
8 files changed
+73 -30

No files matched your search

@@ -58,6 +58,11 @@ public class ListValue extends AbstractListValue implements ContainerValueInterf
items.addAll(list);
}
private ListValue(List<Value> list)
{
items = list;
}
public static Value fromItemStack(ItemStack itemstack)
{
if (itemstack == null || itemstack.isEmpty())
@@ -307,7 +312,7 @@ public class ListValue extends AbstractListValue implements ContainerValueInterf
if (from < 0 || from > size) from = size;
if (from > to)
return ListValue.of();
return new ListValue(getItems().subList((int)from, (int) to));
return new ListValue((Collection<? extends Value>) getItems().subList((int)from, (int) to));
}
@Override
@@ -72,9 +72,9 @@ public class MapValue extends AbstractListValue implements ContainerValueInterfa
return new MapValue(copyMap);
}
public MapValue(Map<Value,Value> other)
private MapValue(Map<Value,Value> other)
{
map = new HashMap<>(other);
map = other;
}
@Override