Use teleportcause

CitizensDev · Feb 14, 2023 · a09a54d · a09a54d
1 parent 22e1821
commit a09a54d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 17 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
@@ -326,7 +326,7 @@ public boolean spawn(Location at, SpawnReason reason) {
             skinnable.getSkinTracker().onSpawnNPC();
         }
 
-        getEntity().teleport(at);
+        teleport(at, TeleportCause.PLUGIN);
 
         NMS.setHeadYaw(getEntity(), at.getYaw());
         NMS.setBodyYaw(getEntity(), at.getYaw());
@@ -468,8 +468,8 @@ public void update() {
 
             if (navigator.isNavigating()) {
                 if (data().get(NPC.Metadata.SWIMMING, true)) {
-                    getEntity().setVelocity(getEntity().getVelocity().multiply(data()
-                            .get(NPC.Metadata.WATER_SPEED_MODIFIER, Setting.NPC_WATER_SPEED_MODIFIER.asFloat())));
+                    getEntity().setVelocity(getEntity().getVelocity().multiply(
+                            data().get(NPC.Metadata.WATER_SPEED_MODIFIER, Setting.NPC_WATER_SPEED_MODIFIER.asFloat())));
                     Location currentDest = navigator.getPathStrategy().getCurrentDestination();
                     if (currentDest == null || currentDest.getY() > getStoredLocation().getY()) {
                         NMS.trySwim(getEntity());

diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java b/main/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java
@@ -154,23 +154,11 @@ 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/trait/PacketNPC.java b/main/src/main/java/net/citizensnpcs/trait/PacketNPC.java
@@ -54,9 +54,9 @@ public EntityController wrap(EntityController controller) {
     public static interface EntityPacketTracker extends Runnable {
         public void link(Player player);
 
-        public void unlinkAll(Consumer<Player> callback);
-
         public void unlink(Player player);
+
+        public void unlinkAll(Consumer<Player> callback);
     }
 
     private class PacketController implements EntityController {