Merge pull request #1388 from Syrent/master

fix: avoid using TAB's internal vanish checks when a registered vanish integration is available
NEZNAMY · Nov 24, 2024 · 378041c · 378041c
2 parents e182366 + ee5ff07
commit 378041c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 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
@@ -200,11 +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().stream().anyMatch(integration -> !integration.canSee(viewer, target))) return false;
-        } catch (ConcurrentModificationException e) {
-            // PV error, try again
-            return canSee(viewer, target);
+        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);
+            }
         }
         return !target.isVanished() || viewer.hasPermission(TabConstants.Permission.SEE_VANISHED);
     }

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
@@ -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;
     }