Add new uuid metho

CitizensDev · Jun 18, 2023 · 1b4be45 · 1b4be45
1 parent f4bdfc4
commit 1b4be45
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java b/src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java
@@ -216,6 +216,20 @@ public boolean equals(Object obj) {
         return true;
     }
 
+    @Override
+    public UUID getMinecraftUniqueId() {
+        if (getEntityType() == EntityType.PLAYER) {
+            UUID uuid = getUniqueId();
+            if (uuid.version() == 4) { // set version to 2
+                long msb = uuid.getMostSignificantBits();
+                msb &= ~0x0000000000004000L;
+                msb |= 0x0000000000002000L;
+                return new UUID(msb, uuid.getLeastSignificantBits());
+            }
+        }
+        return getUniqueId();
+    }
+
     @Override
     public GoalController getDefaultGoalController() {
         return goalController;

diff --git a/src/main/java/net/citizensnpcs/api/npc/NPC.java b/src/main/java/net/citizensnpcs/api/npc/NPC.java
@@ -113,6 +113,15 @@ public interface NPC extends Agent, Cloneable {
      */
     public BlockBreaker getBlockBreaker(Block targetBlock, BlockBreakerConfiguration config);
 
+    /**
+     * For certain mob types (currently, Players) it is beneficial to change the UUID slightly to signal to the client
+     * that the mob is an NPC not a real mob. This will return {@link #getUniqueId()} with the necessary changes for the
+     * current mob type.
+     *
+     * @return The client unique ID.
+     */
+    public UUID getMinecraftUniqueId();
+
     /**
      * Gets the default {@link GoalController} of this NPC.
      *