Merge branch 'master' into 1.15

This commit is contained in:
gnembon committed 2019-10-22 20:31:18 -03:00
commit 7178f5940a
1 file changed
+9 -2
@@ -40,6 +40,7 @@ import net.minecraft.util.hit.EntityHitResult;
import net.minecraft.util.hit.HitResult; import net.minecraft.util.hit.HitResult;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction; import net.minecraft.util.math.Direction;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
@@ -491,13 +492,19 @@ public class EntityValue extends Value
}); });
put("pitch", (e, v) -> put("pitch", (e, v) ->
{ {
e.pitch = (float) NumericValue.asNumber(v).getDouble(); float p = (float) NumericValue.asNumber(v).getDouble();
if (Float.isNaN(p))
return;
e.pitch = MathHelper.clamp(p, -90, 90);
e.prevPitch = e.pitch; e.prevPitch = e.pitch;
updatePosition(e); updatePosition(e);
}); });
put("yaw", (e, v) -> put("yaw", (e, v) ->
{ {
e.yaw = (float) NumericValue.asNumber(v).getDouble(); float p = (float) NumericValue.asNumber(v).getDouble();
if (Float.isNaN(p))
return;
e.yaw = p % 360;
e.prevYaw = e.yaw; e.prevYaw = e.yaw;
updatePosition(e); updatePosition(e);
}); });