From 45fff0f42015cbf4e14c954e68b0343c23e7208f Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Sat, 23 Mar 2024 20:47:11 +0800
Subject: [PATCH] Fix incorrectly inverted canSee check breaking
 getNearbyPlayers

---
 main/src/main/java/net/citizensnpcs/util/NMS.java  | 5 +++--
 main/src/main/java/net/citizensnpcs/util/Util.java | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/main/src/main/java/net/citizensnpcs/util/NMS.java b/main/src/main/java/net/citizensnpcs/util/NMS.java
index 01d79a6eb..ed37c547f 100644
--- a/main/src/main/java/net/citizensnpcs/util/NMS.java
+++ b/main/src/main/java/net/citizensnpcs/util/NMS.java
@@ -530,8 +530,9 @@ public class NMS {
     private static Collection<Player> getNearbyPlayers(Entity from, Location location, double radius) {
         List<Player> players = Lists.newArrayList();
         for (Player player : CitizensAPI.getLocationLookup().getNearbyPlayers(location, radius)) {
-            if (location.getWorld() != player.getWorld() || from != null && Util.canSee(player, from)
-                    || location.distance(player.getLocation()) > radius)
+            if (location.getWorld() != player.getWorld() || location.distance(player.getLocation()) > radius)
+                continue;
+            if (from != null && !Util.canSee(player, from))
                 continue;
 
             players.add(player);
diff --git a/main/src/main/java/net/citizensnpcs/util/Util.java b/main/src/main/java/net/citizensnpcs/util/Util.java
index 3656c26ee..7a4a148ef 100644
--- a/main/src/main/java/net/citizensnpcs/util/Util.java
+++ b/main/src/main/java/net/citizensnpcs/util/Util.java
@@ -106,9 +106,9 @@ public class Util {
     }
 
     public static boolean canSee(Player player, Entity from) {
-        if (from instanceof Player) {
+        if (from instanceof Player)
             return player.canSee((Player) from);
-        }
+
         if (SUPPORTS_ENTITY_CANSEE) {
             try {
                 return player.canSee(from);