Modify blockbreaker distance calculations

CitizensDev · Jun 25, 2022 · 8c4b72c · 8c4b72c
1 parent 659a5b1
commit 8c4b72c
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/util/AbstractBlockBreaker.java b/main/src/main/java/net/citizensnpcs/util/AbstractBlockBreaker.java
@@ -49,17 +49,20 @@ private void cancelNavigation() {
         setTarget = false;
     }
 
-    private double distance() {
-        return entity.getLocation().distance(Util.getCenterLocation(location.getBlock()));
-    }
-
     protected abstract float getDamage(int tickDifference);
 
     protected ItemStack getItemStack() {
         return configuration.item() != null ? configuration.item()
                 : entity instanceof LivingEntity ? ((LivingEntity) entity).getEquipment().getItemInHand() : null;
     }
 
+    private boolean inRange() {
+        Location center = Util.getCenterLocation(location.getBlock());
+        Location loc = entity.getLocation();
+        double xz = Math.sqrt(Math.pow(center.getX() - loc.getX(), 2) + Math.pow(center.getZ() - loc.getZ(), 2));
+        return xz <= configuration.radius() && Math.abs(center.getY() - loc.getY()) <= 3;
+    }
+
     @Override
     public void reset() {
         cancelNavigation();
@@ -80,7 +83,7 @@ public BehaviorStatus run() {
         }
         currentTick = (int) (System.currentTimeMillis() / 50);
         if (configuration.radius() > 0) {
-            if (distance() >= configuration.radius()) {
+            if (!inRange()) {
                 startDigTick = currentTick;
                 if (entity instanceof NPCHolder) {
                     NPC npc = ((NPCHolder) entity).getNPC();