Improved detection of vanished players

Author: zefir-git

src/main/java/pro/cloudnode/smp/cloudnodemsg/CloudnodeMSG.java

@@ -46,7 +46,9 @@ public void onDisable() {
         // Plugin shutdown logic
     }
 
-    public static boolean isVanished(final @NotNull Player player) {
+    public static boolean isVanished(final @NotNull Player player, final @NotNull Player observer) {
+        if (!observer.canSee(player))
+            return true;
         for (final @NotNull MetadataValue meta : player.getMetadata("vanished"))
             if (meta.asBoolean()) return true;
         return false;

src/main/java/pro/cloudnode/smp/cloudnodemsg/Message.java

@@ -57,7 +57,7 @@ public void send(final @NotNull Context context) throws InvalidPlayerError {
         final @NotNull Optional<@NotNull Player> senderPlayer = Optional.ofNullable(this.sender.getPlayer());
         final @NotNull Optional<@NotNull Player> recipientPlayer = Optional.ofNullable(this.recipient.getPlayer());
 
-        if (!recipient.getUniqueId().equals(console.getUniqueId()) && recipientPlayer.isEmpty() || (recipientPlayer.isPresent() && senderPlayer.isPresent() && CloudnodeMSG.isVanished(recipientPlayer.get()) && !senderPlayer.get().hasPermission(Permission.SEND_VANISHED))) {
+        if (!recipient.getUniqueId().equals(console.getUniqueId()) && recipientPlayer.isEmpty() || (recipientPlayer.isPresent() && senderPlayer.isPresent() && CloudnodeMSG.isVanished(recipientPlayer.get(), senderPlayer.get()) && !senderPlayer.get().hasPermission(Permission.SEND_VANISHED))) {
             if (context == Context.CHANNEL) {
                 final @NotNull Player player = Objects.requireNonNull(sender.getPlayer());
                 Message.exitChannel(player);

src/main/java/pro/cloudnode/smp/cloudnodemsg/command/MessageCommand.java

@@ -44,7 +44,7 @@ public boolean run(final @NotNull CommandSender sender, final @NotNull String la
                     return sendMessage(player, CloudnodeMSG.getInstance().config().channelClosed(player.getName(), Optional.ofNullable(recipientOffline.getName()).orElse("Unknown Player"), label));
                 }
             }
-            if (recipient.isEmpty() || (CloudnodeMSG.isVanished(recipient.get()) && !player.hasPermission(Permission.SEND_VANISHED))) return new PlayerNotFoundError(args[0]).send(player);
+            if (recipient.isEmpty() || (CloudnodeMSG.isVanished(recipient.get(), player) && !player.hasPermission(Permission.SEND_VANISHED))) return new PlayerNotFoundError(args[0]).send(player);
             if (!Message.isIncomingEnabled(recipient.get())) return new PlayerHasIncomingDisabledError(recipient.get().getName()).send(player);
             Message.createChannel(player, recipient.get());
             return sendMessage(player, CloudnodeMSG.getInstance().config().channelCreated(player.getName(), recipient.get().getName(), label));