Citizens no longer uses v2 uuids so strip away our code for that

including our own custom player entities i guess
DenizenScript · Feb 13, 2023 · 062ef86 · 062ef86
1 parent 3be9462
commit 062ef86
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 31 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/MirrorTrait.java b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/MirrorTrait.java
@@ -21,17 +21,6 @@ public MirrorTrait() {
         super("mirror");
     }
 
-    public static UUID getUUID(NPC npc) {
-        UUID uuid = npc.getUniqueId();
-        if (uuid.version() == 4) { // clear version
-            long msb = uuid.getMostSignificantBits();
-            msb &= ~0x0000000000004000L;
-            msb |= 0x0000000000002000L;
-            uuid = new UUID(msb, uuid.getLeastSignificantBits());
-        }
-        return uuid;
-    }
-
     public void respawn() {
         Bukkit.getScheduler().scheduleSyncDelayedTask(Denizen.getInstance(), () -> {
             if (npc.isSpawned()) {
@@ -46,15 +35,15 @@ public void respawn() {
 
     public void mirrorOn() {
         NetworkInterceptHelper.enable();
-        UUID uuid = getUUID(npc);
+        UUID uuid = npc.getUniqueId();
         if (!ProfileEditor.mirrorUUIDs.contains(uuid)) {
             ProfileEditor.mirrorUUIDs.add(uuid);
             respawn();
         }
     }
 
     public void mirrorOff() {
-        UUID uuid = getUUID(npc);
+        UUID uuid = npc.getUniqueId();
         if (ProfileEditor.mirrorUUIDs.contains(uuid)) {
             ProfileEditor.mirrorUUIDs.remove(uuid);
             respawn();

diff --git a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/helpers/CustomEntityHelperImpl.java b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/helpers/CustomEntityHelperImpl.java
@@ -107,12 +107,6 @@ else if (name.length() > 46) {
             playerProfile.setTextureSignature(skinProfile.getTextureSignature());
         }
         UUID uuid = UUID.randomUUID();
-        if (uuid.version() == 4) {
-            long msb = uuid.getMostSignificantBits();
-            msb &= ~0x0000000000004000L;
-            msb |= 0x0000000000002000L;
-            uuid = new UUID(msb, uuid.getLeastSignificantBits());
-        }
         playerProfile.setUniqueId(uuid);
 
         GameProfile gameProfile = new GameProfile(playerProfile.getUniqueId(), playerProfile.getName());

diff --git a/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/CustomEntityHelperImpl.java b/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/CustomEntityHelperImpl.java
@@ -110,12 +110,6 @@ else if (skin == null && !name.matches(".*[^A-Za-z0-9_].*")) {
             playerProfile.setTextureSignature(skinProfile.getTextureSignature());
         }
         UUID uuid = UUID.randomUUID();
-        if (uuid.version() == 4) {
-            long msb = uuid.getMostSignificantBits();
-            msb &= ~0x0000000000004000L;
-            msb |= 0x0000000000002000L;
-            uuid = new UUID(msb, uuid.getLeastSignificantBits());
-        }
         playerProfile.setUniqueId(uuid);
 
         GameProfile gameProfile = new GameProfile(playerProfile.getUniqueId(), playerProfile.getName());

diff --git a/v1_19/src/main/java/com/denizenscript/denizen/nms/v1_19/helpers/CustomEntityHelperImpl.java b/v1_19/src/main/java/com/denizenscript/denizen/nms/v1_19/helpers/CustomEntityHelperImpl.java
@@ -110,12 +110,6 @@ else if (skin == null && !name.matches(".*[^A-Za-z0-9_].*")) {
             playerProfile.setTextureSignature(skinProfile.getTextureSignature());
         }
         UUID uuid = UUID.randomUUID();
-        if (uuid.version() == 4) {
-            long msb = uuid.getMostSignificantBits();
-            msb &= ~0x0000000000004000L;
-            msb |= 0x0000000000002000L;
-            uuid = new UUID(msb, uuid.getLeastSignificantBits());
-        }
         playerProfile.setUniqueId(uuid);
 
         GameProfile gameProfile = new GameProfile(playerProfile.getUniqueId(), playerProfile.getName());