From 479e350f12b24ea569ac013591e111eb88a9e8ed Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Mon, 22 Aug 2022 22:51:33 +0800
Subject: [PATCH] Compare center

---
 .../java/net/citizensnpcs/commands/NPCCommands.java  | 12 ++----------
 .../net/citizensnpcs/nms/v1_19_R1/util/NMSImpl.java  |  4 ----
 .../nms/v1_19_R1/util/PlayerNavigation.java          |  6 +++---
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
index 003fea74b..5188e55bd 100644
--- a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
+++ b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
@@ -40,7 +40,6 @@ import org.bukkit.entity.Villager.Profession;
 import org.bukkit.entity.Zombie;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.metadata.FixedMetadataValue;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 
@@ -664,12 +663,12 @@ public class NPCCommands {
 
     @Command(
             aliases = { "npc" },
-            usage = "debug -p(aths) -n(avigation) -r(epathing)",
+            usage = "debug -p(aths) -n(avigation)",
             desc = "Display debugging information",
             modifiers = { "debug" },
             min = 1,
             max = 1,
-            flags = "pnr",
+            flags = "pn",
             permission = "citizens.npc.debug")
     @Requirements(ownership = true, selected = true)
     public void debug(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
@@ -686,13 +685,6 @@ public class NPCCommands {
                     + npc.getNavigator().getDefaultParameters().speed() + "]]<br>";
             output += "Stuck action [[" + npc.getNavigator().getDefaultParameters().stuckAction() + "]]<br>";
             Messaging.send(sender, output);
-        } else if (args.hasFlag('r')) {
-            if (!npc.getEntity().hasMetadata("CitizensPrintMovements")) {
-                npc.getEntity().setMetadata("CitizensPrintMovements",
-                        new FixedMetadataValue(CitizensAPI.getPlugin(), true));
-            } else {
-                npc.getEntity().removeMetadata("CitizensPrintMovements", CitizensAPI.getPlugin());
-            }
         }
     }
 
diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/NMSImpl.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/NMSImpl.java
index 94aff36ba..db66ddd92 100644
--- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/NMSImpl.java
+++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/NMSImpl.java
@@ -720,10 +720,6 @@ public class NMSImpl implements NMSBridge {
                     }
                     lastSpeed = params.speed();
                 }
-                if (entity.hasMetadata("CitizensPrintMovements")) {
-                    Path path = getPathEntity(navigation);
-                    Messaging.log("Next path node " + path.getNextNode().asVec3(), "wanted", getDestination(entity));
-                }
                 if (params.debug() && !navigation.isDone()) {
                     BlockData data = Material.DANDELION.createBlockData();
                     Path path = getPathEntity(navigation);
diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerNavigation.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerNavigation.java
index ce105a7c4..9e090cb7d 100644
--- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerNavigation.java
+++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerNavigation.java
@@ -147,7 +147,7 @@ public class PlayerNavigation extends PathNavigation {
         }
         return true;
     }
-    
+
     private boolean canWalkOn(int var0, int var1, int var2, int var3, int var4, int var5, Vec3 var6, double var7,
             double var9) {
         int var11 = var0 - var3 / 2;
@@ -283,9 +283,9 @@ public class PlayerNavigation extends PathNavigation {
         this.maxDistanceToWaypoint = (this.mob.getBbWidth() > 0.75F) ? (this.mob.getBbWidth() / 2.0F)
                 : (0.75F - this.mob.getBbWidth() / 2.0F);
         BlockPos blockPos = this.path.getNextNodePos();
-        double var2 = Math.abs(this.mob.getX() - blockPos.getX() + 0.5D);
+        double var2 = Math.abs(this.mob.getX() - (blockPos.getX() + 0.5D));
         double var4 = Math.abs(this.mob.getY() - blockPos.getY());
-        double var6 = Math.abs(this.mob.getZ() - blockPos.getZ() + 0.5D);
+        double var6 = Math.abs(this.mob.getZ() - (blockPos.getZ() + 0.5D));
         boolean var8 = (var2 < this.maxDistanceToWaypoint && var6 < this.maxDistanceToWaypoint && var4 < 1.0D);
         if (var8 || (this.mob.canCutCorner((this.path.getNextNode()).type) && shouldTargetNextNodeInDirection(var0)))
             this.path.advance();