From 80c63dd414ee59e71f490fa2baf891c5aad1ae11 Mon Sep 17 00:00:00 2001 From: syrent Date: Sun, 24 Nov 2024 19:55:57 +0330 Subject: [PATCH 1/2] chore: don't check for vanished meta if there's a registered vanish integration --- .../main/java/me/neznamy/tab/shared/platform/Platform.java | 4 +++- .../java/me/neznamy/tab/shared/proxy/ProxyTabPlayer.java | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/shared/src/main/java/me/neznamy/tab/shared/platform/Platform.java b/shared/src/main/java/me/neznamy/tab/shared/platform/Platform.java index f4e46f695..33b84aa8c 100644 --- a/shared/src/main/java/me/neznamy/tab/shared/platform/Platform.java +++ b/shared/src/main/java/me/neznamy/tab/shared/platform/Platform.java @@ -201,7 +201,9 @@ public interface Platform { */ default boolean canSee(@NotNull TabPlayer viewer, @NotNull TabPlayer target) { try { - if (VanishIntegration.getHandlers().stream().anyMatch(integration -> !integration.canSee(viewer, target))) return false; + if (!VanishIntegration.getHandlers().isEmpty()) { + return VanishIntegration.getHandlers().stream().allMatch(integration -> integration.canSee(viewer, target)); + } } catch (ConcurrentModificationException e) { // PV error, try again return canSee(viewer, target); diff --git a/shared/src/main/java/me/neznamy/tab/shared/proxy/ProxyTabPlayer.java b/shared/src/main/java/me/neznamy/tab/shared/proxy/ProxyTabPlayer.java index dba31e250..a3a037961 100644 --- a/shared/src/main/java/me/neznamy/tab/shared/proxy/ProxyTabPlayer.java +++ b/shared/src/main/java/me/neznamy/tab/shared/proxy/ProxyTabPlayer.java @@ -169,8 +169,11 @@ public void sendPluginMessage(@NotNull OutgoingMessage message) { @Override public boolean isVanished() { - for (VanishIntegration i : VanishIntegration.getHandlers()) { - if (i.isVanished(this)) return true; + if (!VanishIntegration.getHandlers().isEmpty()) { + for (VanishIntegration integration : VanishIntegration.getHandlers()) { + if (integration.isVanished(this)) return true; + } + return false; } return vanished; } From ee5ff075651fc4263db45364ac43a3ac30ff242e Mon Sep 17 00:00:00 2001 From: syrent Date: Sun, 24 Nov 2024 20:48:02 +0330 Subject: [PATCH 2/2] chore: move pv try/catch inside vanish integration if statement --- .../java/me/neznamy/tab/shared/platform/Platform.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/shared/src/main/java/me/neznamy/tab/shared/platform/Platform.java b/shared/src/main/java/me/neznamy/tab/shared/platform/Platform.java index 33b84aa8c..e6095906c 100644 --- a/shared/src/main/java/me/neznamy/tab/shared/platform/Platform.java +++ b/shared/src/main/java/me/neznamy/tab/shared/platform/Platform.java @@ -200,13 +200,13 @@ public interface Platform { * @return {@code true} if can see, {@code false} if not. */ default boolean canSee(@NotNull TabPlayer viewer, @NotNull TabPlayer target) { - try { - if (!VanishIntegration.getHandlers().isEmpty()) { + if (!VanishIntegration.getHandlers().isEmpty()) { + try { return VanishIntegration.getHandlers().stream().allMatch(integration -> integration.canSee(viewer, target)); + } catch (ConcurrentModificationException e) { + // PV error, try again + return canSee(viewer, target); } - } catch (ConcurrentModificationException e) { - // PV error, try again - return canSee(viewer, target); } return !target.isVanished() || viewer.hasPermission(TabConstants.Permission.SEE_VANISHED); }