Don't clear uuid version

main/src/main/java/net/citizensnpcs/EventListen.java

@@ -632,6 +632,7 @@ public class EventListen implements Listener {
                 Messaging.debug("Despawned", npc, "due to world unload at", event.getWorld().getName());
             }
         }
+        CitizensAPI.getLocationLookup().onWorldUnload(event);
     }
 
     private void respawnAllFromCoord(ChunkCoord coord, Event event) {

main/src/main/java/net/citizensnpcs/StoredShops.java

@@ -30,7 +30,7 @@ public class StoredShops {
     }
 
     public NPCShop getGlobalShop(String name) {
-        return globalShops.computeIfAbsent(name, s -> new NPCShop(s));
+        return globalShops.computeIfAbsent(name, NPCShop::new);
     }
 
     public NPCShop getShop(String name) {

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HumanController.java

@@ -33,13 +33,6 @@ public class HumanController extends AbstractEntityController {
         String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName;
 
         UUID uuid = npc.getUniqueId();
-        if (uuid.version() == 4) { // clear version
-            long msb = uuid.getMostSignificantBits();
-            msb &= ~0x0000000000004000L;
-            msb |= 0x0000000000002000L;
-            uuid = new UUID(msb, uuid.getLeastSignificantBits());
-        }
-
         String teamName = Util.getTeamName(uuid);
         if (npc.requiresNameHologram()) {
             name = teamName;

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HumanController.java

@@ -33,12 +33,6 @@ public class HumanController extends AbstractEntityController {
         String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName;
 
         UUID uuid = npc.getUniqueId();
-        if (uuid.version() == 4) { // clear version
-            long msb = uuid.getMostSignificantBits();
-            msb &= ~0x0000000000004000L;
-            msb |= 0x0000000000002000L;
-            uuid = new UUID(msb, uuid.getLeastSignificantBits());
-        }
 
         String teamName = Util.getTeamName(uuid);
         if (npc.requiresNameHologram()) {

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HumanController.java

@@ -33,12 +33,6 @@ public class HumanController extends AbstractEntityController {
         String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName;
 
         UUID uuid = npc.getUniqueId();
-        if (uuid.version() == 4) { // clear version
-            long msb = uuid.getMostSignificantBits();
-            msb &= ~0x0000000000004000L;
-            msb |= 0x0000000000002000L;
-            uuid = new UUID(msb, uuid.getLeastSignificantBits());
-        }
 
         String teamName = Util.getTeamName(uuid);
         if (npc.requiresNameHologram()) {

v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HumanController.java

@@ -33,12 +33,6 @@ public class HumanController extends AbstractEntityController {
         String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName;
 
         UUID uuid = npc.getUniqueId();
-        if (uuid.version() == 4) { // clear version
-            long msb = uuid.getMostSignificantBits();
-            msb &= ~0x0000000000004000L;
-            msb |= 0x0000000000002000L;
-            uuid = new UUID(msb, uuid.getLeastSignificantBits());
-        }
 
         String teamName = Util.getTeamName(uuid);
         if (npc.requiresNameHologram()) {

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HumanController.java

@@ -33,12 +33,6 @@ public class HumanController extends AbstractEntityController {
         String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName;
 
         UUID uuid = npc.getUniqueId();
-        if (uuid.version() == 4) { // clear version
-            long msb = uuid.getMostSignificantBits();
-            msb &= ~0x0000000000004000L;
-            msb |= 0x0000000000002000L;
-            uuid = new UUID(msb, uuid.getLeastSignificantBits());
-        }
 
         String teamName = Util.getTeamName(uuid);
         if (npc.requiresNameHologram()) {

v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HumanController.java

@@ -33,12 +33,6 @@ public class HumanController extends AbstractEntityController {
         String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName;
 
         UUID uuid = npc.getUniqueId();
-        if (uuid.version() == 4) { // clear version
-            long msb = uuid.getMostSignificantBits();
-            msb &= ~0x0000000000004000L;
-            msb |= 0x0000000000002000L;
-            uuid = new UUID(msb, uuid.getLeastSignificantBits());
-        }
 
         String teamName = Util.getTeamName(uuid);
         if (npc.requiresNameHologram()) {

v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HumanController.java

@@ -32,12 +32,6 @@ public class HumanController extends AbstractEntityController {
         String coloredName = npc.getFullName();
         String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName;
         UUID uuid = npc.getUniqueId();
-        if (uuid.version() == 4) { // clear version
-            long msb = uuid.getMostSignificantBits();
-            msb &= ~0x0000000000004000L;
-            msb |= 0x0000000000002000L;
-            uuid = new UUID(msb, uuid.getLeastSignificantBits());
-        }
 
         String teamName = Util.getTeamName(uuid);
         if (npc.requiresNameHologram()) {

v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HumanController.java

@@ -32,12 +32,6 @@ public class HumanController extends AbstractEntityController {
         String coloredName = npc.getFullName();
         String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName;
         UUID uuid = npc.getUniqueId();
-        if (uuid.version() == 4) { // clear version
-            long msb = uuid.getMostSignificantBits();
-            msb &= ~0x0000000000004000L;
-            msb |= 0x0000000000002000L;
-            uuid = new UUID(msb, uuid.getLeastSignificantBits());
-        }
 
         String teamName = Util.getTeamName(uuid);
         if (npc.requiresNameHologram()) {

v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HumanController.java

@@ -32,12 +32,6 @@ public class HumanController extends AbstractEntityController {
         String coloredName = npc.getFullName();
         String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName;
         UUID uuid = npc.getUniqueId();
-        if (uuid.version() == 4) { // clear version
-            long msb = uuid.getMostSignificantBits();
-            msb &= ~0x0000000000004000L;
-            msb |= 0x0000000000002000L;
-            uuid = new UUID(msb, uuid.getLeastSignificantBits());
-        }
 
         String teamName = Util.getTeamName(uuid);
         if (npc.requiresNameHologram()) {

v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HumanController.java

@@ -32,12 +32,6 @@ public class HumanController extends AbstractEntityController {
         String coloredName = npc.getFullName();
         String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName;
         UUID uuid = npc.getUniqueId();
-        if (uuid.version() == 4) { // clear version
-            long msb = uuid.getMostSignificantBits();
-            msb &= ~0x0000000000004000L;
-            msb |= 0x0000000000002000L;
-            uuid = new UUID(msb, uuid.getLeastSignificantBits());
-        }
 
         String teamName = Util.getTeamName(uuid);
         if (npc.requiresNameHologram()) {

v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HumanController.java

@@ -33,12 +33,6 @@ public class HumanController extends AbstractEntityController {
         String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName;
 
         UUID uuid = npc.getUniqueId();
-        if (uuid.version() == 4) { // clear version
-            long msb = uuid.getMostSignificantBits();
-            msb &= ~0x0000000000004000L;
-            msb |= 0x0000000000002000L;
-            uuid = new UUID(msb, uuid.getLeastSignificantBits());
-        }
 
         final String teamName = Util.getTeamName(uuid);
         if (npc.requiresNameHologram()) {