From 9e4274516af11911fce415d2fff4e6fb0d5ebc63 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Mon, 29 Feb 2016 00:15:00 +0800
Subject: [PATCH] Double check world in skin packet tracker

---
 .../java/net/citizensnpcs/npc/skin/SkinPacketTracker.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/citizensnpcs/npc/skin/SkinPacketTracker.java b/src/main/java/net/citizensnpcs/npc/skin/SkinPacketTracker.java
index 362c226ea..8f3e49477 100644
--- a/src/main/java/net/citizensnpcs/npc/skin/SkinPacketTracker.java
+++ b/src/main/java/net/citizensnpcs/npc/skin/SkinPacketTracker.java
@@ -183,10 +183,11 @@ public class SkinPacketTracker {
             if (player == null || player.hasMetadata("NPC"))
                 continue;
 
-            if (!player.canSee(from))
+            player.getLocation(CACHE_LOCATION);
+            if (!player.canSee(from) || !location.getWorld().equals(CACHE_LOCATION.getWorld()))
                 continue;
 
-            if (location.distanceSquared(player.getLocation(CACHE_LOCATION)) > radius)
+            if (location.distanceSquared(CACHE_LOCATION) > radius)
                 continue;
 
             updateViewer(player);