diff --git a/src/main/java/net/minestom/server/utils/location/RelativeBlockPosition.java b/src/main/java/net/minestom/server/utils/location/RelativeBlockPosition.java index 0d1eec53f..372597b95 100644 --- a/src/main/java/net/minestom/server/utils/location/RelativeBlockPosition.java +++ b/src/main/java/net/minestom/server/utils/location/RelativeBlockPosition.java @@ -17,11 +17,11 @@ public class RelativeBlockPosition extends RelativeLocation { } @Override - public BlockPosition from(@Nullable Entity entity) { + public BlockPosition from(@Nullable Position position) { if (!relativeX && !relativeY && !relativeZ) { return location.clone(); } - final Position entityPosition = entity != null ? entity.getPosition() : new Position(); + final Position entityPosition = position != null ? position : new Position(); final int x = location.getX() + (relativeX ? (int) entityPosition.getX() : 0); final int y = location.getY() + (relativeY ? (int) entityPosition.getY() : 0); diff --git a/src/main/java/net/minestom/server/utils/location/RelativeLocation.java b/src/main/java/net/minestom/server/utils/location/RelativeLocation.java index 7a2cb3ec4..e800bc0bb 100644 --- a/src/main/java/net/minestom/server/utils/location/RelativeLocation.java +++ b/src/main/java/net/minestom/server/utils/location/RelativeLocation.java @@ -1,6 +1,7 @@ package net.minestom.server.utils.location; import net.minestom.server.entity.Entity; +import net.minestom.server.utils.Position; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -27,7 +28,7 @@ public abstract class RelativeLocation { * @param entity the entity to get the relative position from * @return the location */ - public abstract T from(@Nullable Entity entity); + public abstract T from(@Nullable Position entity); /** * Gets if the 'x' field is relative. diff --git a/src/main/java/net/minestom/server/utils/location/RelativeVec.java b/src/main/java/net/minestom/server/utils/location/RelativeVec.java index 606e9d62d..ad3e838a9 100644 --- a/src/main/java/net/minestom/server/utils/location/RelativeVec.java +++ b/src/main/java/net/minestom/server/utils/location/RelativeVec.java @@ -17,11 +17,11 @@ public class RelativeVec extends RelativeLocation { } @Override - public Vector from(@Nullable Entity entity) { + public Vector from(@Nullable Position position) { if (!relativeX && !relativeY && !relativeZ) { return location.clone(); } - final Position entityPosition = entity != null ? entity.getPosition() : new Position(); + final Position entityPosition = position != null ? position : new Position(); final double x = location.getX() + (relativeX ? entityPosition.getX() : 0); final double y = location.getY() + (relativeY ? entityPosition.getY() : 0);