From fd0e57e7fe4bce7126ee17e4213eb6b0c4c431b5 Mon Sep 17 00:00:00 2001
From: D3v1s0m <49519439+D3v1s0m@users.noreply.github.com>
Date: Tue, 18 Jul 2023 16:46:53 +0530
Subject: [PATCH] remove redundant method isShown

---
 .../main/java/lol/pyr/znpcsplus/tasks/NpcProcessorTask.java | 6 +++---
 plugin/src/main/java/lol/pyr/znpcsplus/util/Viewable.java   | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/tasks/NpcProcessorTask.java b/plugin/src/main/java/lol/pyr/znpcsplus/tasks/NpcProcessorTask.java
index 426a854..1e91139 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/tasks/NpcProcessorTask.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/tasks/NpcProcessorTask.java
@@ -37,20 +37,20 @@ public class NpcProcessorTask extends BukkitRunnable {
             Player closest = null;
             for (Player player : Bukkit.getOnlinePlayers()) {
                 if (!player.getWorld().equals(npc.getWorld())) {
-                    if (npc.isShown(player)) npc.hide(player);
+                    if (npc.isVisibleTo(player)) npc.hide(player);
                     continue;
                 }
                 double distance = player.getLocation().distanceSquared(npc.getBukkitLocation());
 
                 // visibility
                 boolean inRange = distance <= distSq;
-                if (!inRange && npc.isShown(player)) {
+                if (!inRange && npc.isVisibleTo(player)) {
                     NpcDespawnEvent event = new NpcDespawnEvent(player, entry);
                     Bukkit.getPluginManager().callEvent(event);
                     if (!event.isCancelled()) npc.hide(player);
                 }
                 if (inRange) {
-                    if (!npc.isShown(player)) {
+                    if (!npc.isVisibleTo(player)) {
                         NpcSpawnEvent event = new NpcSpawnEvent(player, entry);
                         Bukkit.getPluginManager().callEvent(event);
                         if (event.isCancelled()) continue;
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/util/Viewable.java b/plugin/src/main/java/lol/pyr/znpcsplus/util/Viewable.java
index 8bd8f56..b1be5f1 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/util/Viewable.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/util/Viewable.java
@@ -37,10 +37,6 @@ public abstract class Viewable {
         viewers.remove(player);
     }
 
-    public boolean isShown(Player player) {
-        return viewers.contains(player);
-    }
-
     protected void UNSAFE_hideAll() {
         for (Player viewer : viewers) UNSAFE_hide(viewer);
     }