From 9090d1c69be282aa3c63efaaabb73e8ff12de7b8 Mon Sep 17 00:00:00 2001 From: fullwall Date: Sun, 19 Apr 2020 01:28:40 +0800 Subject: [PATCH] Fix lookclose target invalidation --- main/src/main/java/net/citizensnpcs/npc/skin/Skin.java | 3 +-- main/src/main/java/net/citizensnpcs/trait/LookClose.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/main/src/main/java/net/citizensnpcs/npc/skin/Skin.java b/main/src/main/java/net/citizensnpcs/npc/skin/Skin.java index 7695dde5b..043e4c1e3 100644 --- a/main/src/main/java/net/citizensnpcs/npc/skin/Skin.java +++ b/main/src/main/java/net/citizensnpcs/npc/skin/Skin.java @@ -82,8 +82,7 @@ public class Skin { NPC npc = entity.getNPC(); // Use npc cached skin if available. - // If npc requires latest skin, cache is used for faster - // availability until the latest skin can be loaded. + // If npc requires latest skin, cache is used for faster availability until the latest skin can be loaded. String cachedName = npc.data().get(CACHED_SKIN_UUID_NAME_METADATA); String texture = npc.data().get(NPC.PLAYER_SKIN_TEXTURE_PROPERTIES_METADATA, "cache"); if (this.skinName.equals(cachedName) && !texture.equals("cache")) { diff --git a/main/src/main/java/net/citizensnpcs/trait/LookClose.java b/main/src/main/java/net/citizensnpcs/trait/LookClose.java index 7d4f728a8..19723f1a6 100644 --- a/main/src/main/java/net/citizensnpcs/trait/LookClose.java +++ b/main/src/main/java/net/citizensnpcs/trait/LookClose.java @@ -100,7 +100,7 @@ public class LookClose extends Trait implements Toggleable, CommandConfigurable if (lookingAt == null) return true; if (!lookingAt.isOnline() || lookingAt.getWorld() != npc.getEntity().getWorld() - || lookingAt.getLocation(PLAYER_LOCATION).distanceSquared(NPC_LOCATION) > range) { + || lookingAt.getLocation(PLAYER_LOCATION).distanceSquared(NPC_LOCATION) > range * range) { lookingAt = null; } return lookingAt == null;