GH-938 Fix Players in vanish can still be messaged by manually typing their name

eternalcore-core/src/main/java/com/eternalcode/core/bridge/litecommand/argument/PlayerArgument.java

@@ -16,7 +16,15 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import java.util.function.Predicate;
+
 @LiteArgument(type = Player.class)
+
+@FeatureDocs(
+    name = "Vanish tabulation",
+    description = "EternalCore prevents non-admin players from seeing vanished players in the commands like /tpa."
+        + " To re-enable this feature for specific players, grant them the eternalcore.vanish.tabulation.see permission."
+)
 public class PlayerArgument extends AbstractViewerArgument<Player> {
 
     private final Server server;
@@ -41,14 +49,13 @@ public ParseResult<Player> parse(Invocation<CommandSender> invocation, String ar
             return ParseResult.failure(translation.argument().offlinePlayer());
         }
 
+        if (this.vanishService.isVanished(target) && !this.canSeeVanished(invocation.sender())) {
+            return ParseResult.failure(translation.argument().offlinePlayer());
+        }
+
         return ParseResult.success(target);
     }
 
-    @FeatureDocs(
-        name = "Vanish tabulation",
-        description = "EternalCore prevents non-admin players from seeing vanished players in the commands like /tpa."
-            + " To re-enable this feature for specific players, grant them the eternalcore.vanish.tabulation.see permission."
-    )
     @Override
     public SuggestionResult suggest(
         Invocation<CommandSender> invocation,
@@ -57,12 +64,19 @@ public SuggestionResult suggest(
     ) {
         CommandSender sender = invocation.sender();
         return this.server.getOnlinePlayers().stream()
-            .filter(player -> this.canSeeVanished(sender) || !this.vanishService.isVanished(player.getUniqueId()))
+            .filter(player -> canSee(sender, player))
             .map(Player::getName)
             .collect(SuggestionResult.collector());
     }
 
-    public boolean canSeeVanished(CommandSender sender) {
+    private boolean canSee(CommandSender sender, Player player) {
+        if (this.canSeeVanished(sender)) {
+            return true;
+        }
+        return !this.vanishService.isVanished(player.getUniqueId());
+    }
+
+    private boolean canSeeVanished(CommandSender sender) {
         return sender.hasPermission(VanishPermissionConstant.VANISH_SEE_TABULATION_PERMISSION);
     }
 }