teleport should check cross-world

CitizensDev · Jul 10, 2020 · c60e18b · c60e18b
1 parent f3986ec
commit c60e18b
Showing 1 changed file with 2 additions and 1 deletion.
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,8 @@ public boolean spawn(Location at, SpawnReason reason) {
     @Override
     public void teleport(Location location, TeleportCause reason) {
         super.teleport(location, reason);
-        if (isSpawned() && getEntity().getLocation(CACHE_LOCATION).distanceSquared(location) < 1) {
+        Location npcLoc = getEntity().getLocation(CACHE_LOCATION);
+        if (isSpawned() && npcLoc.getWorld() == location.getWorld() && npcLoc.distanceSquared(location) < 1) {
             NMS.setHeadYaw(getEntity(), location.getYaw());
         }
     }