Partially restore uuid version reset code

CitizensDev · Apr 15, 2023 · 5bb73b3 · 5bb73b3
1 parent 07d2c97
commit 5bb73b3
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java b/main/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java
@@ -154,11 +154,23 @@ public NPC getById(int id) {
 
     @Override
     public NPC getByUniqueId(UUID uuid) {
+        if (uuid.version() == 2) {
+            long msb = uuid.getMostSignificantBits();
+            msb &= ~0x0000000000002000L;
+            msb |= 0x0000000000004000L;
+            uuid = new UUID(msb, uuid.getLeastSignificantBits());
+        }
         return uniqueNPCs.get(uuid);
     }
 
     @Override
     public NPC getByUniqueIdGlobal(UUID uuid) {
+        if (uuid.version() == 2) {
+            long msb = uuid.getMostSignificantBits();
+            msb &= ~0x0000000000002000L;
+            msb |= 0x0000000000004000L;
+            uuid = new UUID(msb, uuid.getLeastSignificantBits());
+        }
         NPC npc = getByUniqueId(uuid);
         if (npc != null)
             return npc;

diff --git a/main/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java b/main/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java
@@ -99,7 +99,7 @@ public boolean update() {
         }
         Location loc = npc.getEntity().getLocation(NPC_LOCATION);
         /* Proper door movement - gets stuck on corners at times
-        
+
          Block block = currLoc.getWorld().getBlockAt(vector.getBlockX(), vector.getBlockY(), vector.getBlockZ());
           if (MinecraftBlockExaminer.isDoor(block.getType())) {
             Door door = (Door) block.getState().getData();

diff --git a/main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java b/main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java
@@ -7,7 +7,6 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@@ -330,8 +329,7 @@ public void setTarget(Iterable<Vector> path) {
         setTarget(params -> {
             if (npc.isFlyable()) {
                 return new FlyingAStarNavigationStrategy(npc, path, params);
-            } else if (params.useNewPathfinder()
-                    || (!(npc.getEntity() instanceof LivingEntity) && !(npc.getEntity() instanceof ArmorStand))) {
+            } else if (params.useNewPathfinder() || !(npc.getEntity() instanceof LivingEntity)) {
                 return new AStarNavigationStrategy(npc, path, params);
             } else {
                 return new MCNavigationStrategy(npc, path, params);
@@ -351,8 +349,7 @@ public void setTarget(Location targetIn) {
         setTarget(params -> {
             if (npc.isFlyable()) {
                 return new FlyingAStarNavigationStrategy(npc, target, params);
-            } else if (params.useNewPathfinder()
-                    || (!(npc.getEntity() instanceof LivingEntity) && !(npc.getEntity() instanceof ArmorStand))) {
+            } else if (params.useNewPathfinder() || !(npc.getEntity() instanceof LivingEntity)) {
                 return new AStarNavigationStrategy(npc, target, params);
             } else {
                 return new MCNavigationStrategy(npc, target, params);

diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HumanController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HumanController.java
@@ -32,6 +32,12 @@ protected Entity createEntity(final Location at, final NPC npc) {
         String coloredName = npc.getFullName();
         String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName;
         UUID uuid = npc.getUniqueId();
+        if (uuid.version() == 4) { // set version to 2
+            long msb = uuid.getMostSignificantBits();
+            msb &= ~0x0000000000004000L;
+            msb |= 0x0000000000002000L;
+            uuid = new UUID(msb, uuid.getLeastSignificantBits());
+        }
         String teamName = Util.getTeamName(uuid);
         if (npc.requiresNameHologram()) {
             name = teamName;