Merge branch 'master' into 1.17
This commit is contained in:
commit
407c117c29
5 files changed
+43
-5
No files matched your search
@@ -1050,7 +1050,22 @@ public class EntityValue extends Value
|
||||
updatePosition(e, e.getX(), e.getY(), e.getZ(), e.getYaw(), MathHelper.clamp((float)NumericValue.asNumber(v).getDouble(), -90, 90));
|
||||
});
|
||||
|
||||
//"look"
|
||||
put("look", (e, v) -> {
|
||||
if (!(v instanceof ListValue)) throw new InternalExpressionException("Expected a list of 3 parameters as a second argument");
|
||||
List<Value> vec = ((ListValue)v).getItems();
|
||||
float x = NumericValue.asNumber(vec.get(0)).getFloat();
|
||||
float y = NumericValue.asNumber(vec.get(1)).getFloat();
|
||||
float z = NumericValue.asNumber(vec.get(2)).getFloat();
|
||||
float l = MathHelper.sqrt(x*x + y*y + z*z);
|
||||
if(l==0) return;
|
||||
x /= l;
|
||||
y /= l;
|
||||
z /= l;
|
||||
float pitch = (float) -Math.asin(y) / 0.017453292F;
|
||||
float yaw = (float) (x==0 && z==0 ? e.yaw : MathHelper.atan2(-x,z) / 0.017453292F);
|
||||
updatePosition(e, e.getX(), e.getY(), e.getZ(), yaw, pitch);
|
||||
});
|
||||
|
||||
//"turn"
|
||||
//"nod"
|
||||
|
||||
|
||||
Reference in new issue
Block a user