From 4b9c4a97c354ad74059e44a760963df672c871f1 Mon Sep 17 00:00:00 2001 From: MrMicky Date: Thu, 21 Feb 2019 16:52:13 +0100 Subject: [PATCH] Remove unnecessary contains before add and remove on HashSet --- commons/src/main/java/net/jitse/npclib/api/NPC.java | 12 +++--------- .../net/jitse/npclib/listeners/PlayerListener.java | 8 ++------ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/commons/src/main/java/net/jitse/npclib/api/NPC.java b/commons/src/main/java/net/jitse/npclib/api/NPC.java index 5d3d59d..a37227a 100755 --- a/commons/src/main/java/net/jitse/npclib/api/NPC.java +++ b/commons/src/main/java/net/jitse/npclib/api/NPC.java @@ -132,9 +132,7 @@ public abstract class NPC implements PacketHandler, ActionHandler { shown.add(player.getUniqueId()); } - if (!autoHidden.contains(player.getUniqueId())) { - autoHidden.add(player.getUniqueId()); - } + autoHidden.add(player.getUniqueId()); return; } @@ -154,9 +152,7 @@ public abstract class NPC implements PacketHandler, ActionHandler { if (player.getLocation().distance(location) <= autoHideDistance) { sendShowPackets(player); } else { - if (!autoHidden.contains(player.getUniqueId())) { - autoHidden.add(player.getUniqueId()); - } + autoHidden.add(player.getUniqueId()); } } } @@ -189,9 +185,7 @@ public abstract class NPC implements PacketHandler, ActionHandler { if (player.getWorld().equals(location.getWorld()) && player.getLocation().distance(location) <= autoHideDistance) { sendHidePackets(player, scheduler); } else { - if (autoHidden.contains(player.getUniqueId())) { - autoHidden.remove(player.getUniqueId()); - } + autoHidden.remove(player.getUniqueId()); } } } diff --git a/commons/src/main/java/net/jitse/npclib/listeners/PlayerListener.java b/commons/src/main/java/net/jitse/npclib/listeners/PlayerListener.java index 18a5995..e613ad2 100755 --- a/commons/src/main/java/net/jitse/npclib/listeners/PlayerListener.java +++ b/commons/src/main/java/net/jitse/npclib/listeners/PlayerListener.java @@ -25,14 +25,10 @@ public class PlayerListener implements Listener { public void onPlayerQuit(PlayerQuitEvent event) { Player player = event.getPlayer(); for (NPC npc : NPCManager.getAllNPCs()) { - if (npc.getAutoHidden().contains(player.getUniqueId())) { - npc.getAutoHidden().remove(player.getUniqueId()); - } + npc.getAutoHidden().remove(player.getUniqueId()); // Don't need to use NPC#hide since the entity is not registered in the NMS server. - if (npc.getShown().contains(player.getUniqueId())) { - npc.getShown().remove(player.getUniqueId()); - } + npc.getShown().remove(player.getUniqueId()); } }