Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-04 23:47:59 +01:00
Code Issues Projects Releases Wiki Activity

Inline delta computation

Browse Source
This commit is contained in:
TheMode 2021-08-13 10:26:46 +02:00
parent c89f049dad
commit 3f01d63913
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/net/minestom/server/entity/pathfinding/Navigator.java
View File

@ -46,37 +46,24 @@ public class Navigator {
*/ */
public void moveTowards(@NotNull Point direction, double speed) { public void moveTowards(@NotNull Point direction, double speed) {
final Pos position = entity.getPosition(); final Pos position = entity.getPosition();
final double dx = direction.x() - position.x();
final double currentX = position.x(); final double dy = direction.y() - position.y();
final double currentY = position.y(); final double dz = direction.z() - position.z();
final double currentZ = position.z();
final double targetX = direction.x();
final double targetY = direction.y();
final double targetZ = direction.z();
final double dx = targetX - currentX;
final double dy = targetY - currentY;
final double dz = targetZ - currentZ;
// the purpose of these few lines is to slow down entities when they reach their destination // the purpose of these few lines is to slow down entities when they reach their destination
final double distSquared = dx * dx + dy * dy + dz * dz; final double distSquared = dx * dx + dy * dy + dz * dz;
if (speed > distSquared) { if (speed > distSquared) {
speed = distSquared; speed = distSquared;
} }
final double radians = Math.atan2(dz, dx); final double radians = Math.atan2(dz, dx);
final double speedX = Math.cos(radians) * speed; final double speedX = Math.cos(radians) * speed;
final double speedY = dy * speed; final double speedY = dy * speed;
final double speedZ = Math.sin(radians) * speed; final double speedZ = Math.sin(radians) * speed;
// Update 'position' view // Update 'position' view
final var view = PositionUtils.lookAlong(position, dx, direction.y(), dz); final var view = PositionUtils.lookAlong(position, dx, direction.y(), dz);
entity.setView(view.yaw(), view.pitch()); this.entity.setView(view.yaw(), view.pitch());
// Prevent ghosting // Prevent ghosting
final var physicsResult = CollisionUtils.handlePhysics(entity, new Vec(speedX, speedY, speedZ)); final var physicsResult = CollisionUtils.handlePhysics(entity, new Vec(speedX, speedY, speedZ));
entity.refreshPosition(physicsResult.newPosition()); this.entity.refreshPosition(physicsResult.newPosition());
} }
public void jump(float height) { public void jump(float height) {
@ -120,7 +107,7 @@ public class Navigator {
return false; return false;
} }
// Can't path outside of the world border // Can't path outside the world border
final WorldBorder worldBorder = instance.getWorldBorder(); final WorldBorder worldBorder = instance.getWorldBorder();
if (!worldBorder.isInside(point)) { if (!worldBorder.isInside(point)) {
return false; return false;