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

Rewind EntityCreature#moveTowards

Browse Source
This commit is contained in:
Felix Cravic 2020-07-29 00:31:45 +02:00
parent 65bd725cb5
commit da5f318b09
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/net/minestom/server/entity/EntityCreature.java
View File

@ -11,7 +11,6 @@ import net.minestom.server.instance.Instance;
import net.minestom.server.item.ItemStack; import net.minestom.server.item.ItemStack;
import net.minestom.server.network.packet.server.play.*; import net.minestom.server.network.packet.server.play.*;
import net.minestom.server.network.player.PlayerConnection; import net.minestom.server.network.player.PlayerConnection;
import net.minestom.server.utils.MathUtils;
import net.minestom.server.utils.Position; import net.minestom.server.utils.Position;
import net.minestom.server.utils.Vector; import net.minestom.server.utils.Vector;
import net.minestom.server.utils.chunk.ChunkUtils; import net.minestom.server.utils.chunk.ChunkUtils;
@ -62,7 +61,9 @@ public abstract class EntityCreature extends LivingEntity {
} else { } else {
final float speed = getAttributeValue(Attribute.MOVEMENT_SPEED); final float speed = getAttributeValue(Attribute.MOVEMENT_SPEED);
Position targetPosition = pathingEntity.getTargetPosition(); Position targetPosition = pathingEntity.getTargetPosition();
//targetPosition = new Position(-5, 40, -5); //targetPosition = new Position(-5.5f, 40f, -5.5f);
//System.out.println("target: " + targetPosition);
//System.out.println("current: " + getPosition());
moveTowards(targetPosition, speed); moveTowards(targetPosition, speed);
} }
} }
@ -90,7 +91,7 @@ public abstract class EntityCreature extends LivingEntity {
final float newY = newPosition.getY(); final float newY = newPosition.getY();
final float newZ = newPosition.getZ(); final float newZ = newPosition.getZ();
// Creatures cannot move in unload chunk // Creatures cannot move in unloaded chunk
if (ChunkUtils.isChunkUnloaded(getInstance(), newX, newZ)) if (ChunkUtils.isChunkUnloaded(getInstance(), newX, newZ))
return; return;
@ -301,19 +302,16 @@ public abstract class EntityCreature extends LivingEntity {
*/ */
public void moveTowards(Position direction, float speed) { public void moveTowards(Position direction, float speed) {
Check.notNull(direction, "The direction cannot be null"); Check.notNull(direction, "The direction cannot be null");
final float x = getPosition().getX(); final float currentX = position.getX();
final float y = getPosition().getY(); final float currentZ = position.getZ();
final float z = getPosition().getZ(); final float targetX = direction.getX();
final float targetZ = direction.getZ();
float dx = (direction.getX() - x); final float radians = (float) Math.atan2(targetZ - currentZ, targetX - currentX);
float dy = (direction.getY() - y); final float speedX = (float) (Math.cos(radians) * speed);
float dz = (direction.getZ() - z); final float speedZ = (float) (Math.sin(radians) * speed);
dx = MathUtils.clampFloat(dx, -speed, speed); move(speedX, 0, speedZ, true);
dy = MathUtils.clampFloat(dy, -speed, speed);
dz = MathUtils.clampFloat(dz, -speed, speed);
move(dx, dy, dz, true);
} }
private ItemStack getEquipmentItem(ItemStack itemStack, ArmorEquipEvent.ArmorSlot armorSlot) { private ItemStack getEquipmentItem(ItemStack itemStack, ArmorEquipEvent.ArmorSlot armorSlot) {