Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-12-26 11:07:59 +01:00
Code Issues Projects Releases Wiki Activity

Measure block breaker distance from center block

Browse Source
This commit is contained in:
fullwall 2022-06-22 12:13:10 +08:00
parent 318596c715
commit d0366bccde
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/src/main/java/net/citizensnpcs/util/AbstractBlockBreaker.java
View File

@ -36,8 +36,7 @@ public abstract class AbstractBlockBreaker extends BlockBreaker {
}
private double distance() {
Location loc = entity.getLocation();
return Math.sqrt(Math.pow(loc.getX() - x, 2) + Math.pow(loc.getZ() - z, 2));
return entity.getLocation().distance(Util.getCenterLocation(location.getBlock()));
}
protected abstract float getDamage(int tickDifference);
@ -78,7 +77,7 @@ public abstract class AbstractBlockBreaker extends BlockBreaker {
NPC npc = ((NPCHolder) entity).getNPC();
if (npc != null && !npc.getNavigator().isNavigating()) {
npc.getNavigator().setTarget(location.clone().add(0, 1, 0));
npc.getNavigator().getLocalParameters().distanceMargin(configuration.radius() - 1);
npc.getNavigator().getLocalParameters().distanceMargin(Math.max(configuration.radius() - 1, 0.5));
setTarget = true;
}
}
@ -112,5 +111,4 @@ public abstract class AbstractBlockBreaker extends BlockBreaker {
public boolean shouldExecute() {
return !entity.getWorld().getBlockAt(x, y, z).isEmpty();
}
}