fix merge errors
This commit is contained in:
1 parent
609fc67061
commit
3e3dc3f868
1 file changed
+2
-1
@@ -51,7 +51,8 @@ public class Vector3Argument extends Argument
|
||||
Value v1 = params.get(0 + offset).evalValue(c);
|
||||
if (v1 instanceof BlockValue)
|
||||
{
|
||||
return (new Vector3Argument(new Vec3d(((BlockValue) v1).getPos()).add(0.5,0.5,0.5), 1+offset)).fromBlock();
|
||||
// pos + 0.5v
|
||||
return (new Vector3Argument(Vec3d.method_24953(((BlockValue) v1).getPos()), 1+offset)).fromBlock();
|
||||
}
|
||||
if (v1 instanceof ListValue)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user