Merge branch 'master' into 1.15
This commit is contained in:
commit
d212fcb03d
6 files changed
+57
-56
No files matched your search
@@ -144,8 +144,6 @@ public class BlockValue extends Value
|
||||
}
|
||||
if (v1 instanceof BlockValue)
|
||||
{
|
||||
((BlockValue) v1).getBlockState();
|
||||
((BlockValue) v1).getData();
|
||||
return new LocatorResult(((BlockValue) v1), 1+offset);
|
||||
}
|
||||
if (v1 instanceof ListValue)
|
||||
@@ -256,7 +254,7 @@ public class BlockValue extends Value
|
||||
@Override
|
||||
public Value clone()
|
||||
{
|
||||
return new BlockValue(blockState, world, pos);
|
||||
return new BlockValue(blockState, world, pos, data);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -48,6 +48,7 @@ public abstract class Value implements Comparable<Value>, Cloneable
|
||||
{
|
||||
// should not happen
|
||||
e.printStackTrace();
|
||||
throw new InternalExpressionException("Variable of type "+getTypeString()+" is not cloneable. Tell gnembon about it, this shoudn't happen");
|
||||
}
|
||||
copy.boundVariable = var;
|
||||
return copy;
|
||||
|
||||
Reference in new issue
Block a user