From 3e3dc3f868d9b22d5063247336eafa7bd01e74e6 Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Thu, 16 Apr 2020 23:32:02 -0300
Subject: [PATCH] fix merge errors

---
 src/main/java/carpet/script/argument/Vector3Argument.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/carpet/script/argument/Vector3Argument.java b/src/main/java/carpet/script/argument/Vector3Argument.java
index beb2a827..b39b56bf 100644
--- a/src/main/java/carpet/script/argument/Vector3Argument.java
+++ b/src/main/java/carpet/script/argument/Vector3Argument.java
@@ -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)
             {