Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-07 00:48:28 +01:00
Code Issues Projects Releases Wiki Activity

Clamp Pos#yaw

Browse Source
This commit is contained in:
TheMode 2021-08-19 23:22:50 +02:00
parent 874c60fb6a
commit 8762e54451
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/net/minestom/server/coordinate/Pos.java
View File

@ -23,7 +23,7 @@ public final class Pos implements Point {
this.x = x; this.x = x;
this.y = y; this.y = y;
this.z = z; this.z = z;
this.yaw = yaw; this.yaw = fixYaw(yaw);
this.pitch = pitch; this.pitch = pitch;
} }
@ -108,7 +108,7 @@ public final class Pos implements Point {
@Contract(pure = true) @Contract(pure = true)
public @NotNull Pos withYaw(@NotNull DoubleUnaryOperator operator) { public @NotNull Pos withYaw(@NotNull DoubleUnaryOperator operator) {
return new Pos(x, y, z, (float) operator.applyAsDouble(yaw), pitch); return withYaw((float) operator.applyAsDouble(yaw));
} }
@Contract(pure = true) @Contract(pure = true)
@ -118,7 +118,7 @@ public final class Pos implements Point {
@Contract(pure = true) @Contract(pure = true)
public @NotNull Pos withPitch(@NotNull DoubleUnaryOperator operator) { public @NotNull Pos withPitch(@NotNull DoubleUnaryOperator operator) {
return new Pos(x, y, z, yaw, (float) operator.applyAsDouble(pitch)); return withPitch((float) operator.applyAsDouble(pitch));
} }
/** /**
@ -325,4 +325,21 @@ public final class Pos implements Point {
public interface Operator { public interface Operator {
@NotNull Pos apply(double x, double y, double z, float yaw, float pitch); @NotNull Pos apply(double x, double y, double z, float yaw, float pitch);
} }
/**
* Fixes a yaw value that is not between -180.0F and 180.0F
* So for example -1355.0F becomes 85.0F and 225.0F becomes -135.0F
*
* @param yaw The possible "wrong" yaw
* @return a fixed yaw
*/
private static float fixYaw(float yaw) {
yaw = yaw % 360;
if (yaw < -180.0F) {
yaw += 360.0F;
} else if (yaw > 180.0F) {
yaw -= 360.0F;
}
return yaw;
}
} }