From e29bbc8de60372b06a9a37cc2aba6047065f7a43 Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Sat, 1 Mar 2025 20:14:39 -0600 Subject: [PATCH] fix: check if player is online for SuperVanish and PremiumVanish hooks to prevent db lookups --- .../hooks/misc/HookPremiumVanish.java | 12 +++++------- .../hibiscuscommons/hooks/misc/HookSuperVanish.java | 12 +++++------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/common/src/main/java/me/lojosho/hibiscuscommons/hooks/misc/HookPremiumVanish.java b/common/src/main/java/me/lojosho/hibiscuscommons/hooks/misc/HookPremiumVanish.java index 1f401c4..45965a5 100644 --- a/common/src/main/java/me/lojosho/hibiscuscommons/hooks/misc/HookPremiumVanish.java +++ b/common/src/main/java/me/lojosho/hibiscuscommons/hooks/misc/HookPremiumVanish.java @@ -40,12 +40,10 @@ public class HookPremiumVanish extends Hook { @Override public boolean isInvisible(UUID uuid) { - OfflinePlayer player = Bukkit.getOfflinePlayer(uuid); - if (!player.isOnline()) { - return VanishAPI.isInvisibleOffline(uuid); - } - Player onlinePlayer = player.getPlayer(); - if (onlinePlayer == null) return false; - return VanishAPI.isInvisible(onlinePlayer); + OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(uuid); + if (!offlinePlayer.isOnline()) return false; + Player player = offlinePlayer.getPlayer(); + if (player == null) return false; + return VanishAPI.isInvisible(player); } } diff --git a/common/src/main/java/me/lojosho/hibiscuscommons/hooks/misc/HookSuperVanish.java b/common/src/main/java/me/lojosho/hibiscuscommons/hooks/misc/HookSuperVanish.java index 3610d78..48fe3c0 100644 --- a/common/src/main/java/me/lojosho/hibiscuscommons/hooks/misc/HookSuperVanish.java +++ b/common/src/main/java/me/lojosho/hibiscuscommons/hooks/misc/HookSuperVanish.java @@ -41,12 +41,10 @@ public class HookSuperVanish extends Hook { @Override public boolean isInvisible(UUID uuid) { - OfflinePlayer player = Bukkit.getOfflinePlayer(uuid); - if (!player.isOnline()) { - return VanishAPI.isInvisibleOffline(uuid); - } - Player onlinePlayer = player.getPlayer(); - if (onlinePlayer == null) return false; - return VanishAPI.isInvisible(onlinePlayer); + OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(uuid); + if (!offlinePlayer.isOnline()) return false; + Player player = offlinePlayer.getPlayer(); + if (player == null) return false; + return VanishAPI.isInvisible(player); } }