don't run expensive offline player check if player is not in a channel

Author: zefir-git

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

@@ -263,6 +263,15 @@ public static boolean hasChannel(final @NotNull Player player, final @NotNull Of
         return channel.isPresent() && channel.get().getUniqueId().equals(recipient.getUniqueId());
     }
 
+    /**
+     * Check whether player has DM channel
+     *
+     * @param player The player
+     */
+    public static boolean hasChannel(final @NotNull Player player) {
+        return getChannel(player).isPresent();
+    }
+
     /**
      * Team message channel
      *

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

@@ -38,10 +38,12 @@ public boolean run(final @NotNull CommandSender sender, final @NotNull String la
             return new MessageYourselfError().send(sender);
         if (args.length == 1) {
             final @NotNull Player player = (Player) sender;
-            final @NotNull OfflinePlayer recipientOffline = CloudnodeMSG.getInstance().getServer().getOfflinePlayer(args[0]);
-            if (Message.getChannel(player).map(r -> r.getUniqueId().equals(recipientOffline.getUniqueId())).orElse(false)) {
-                Message.exitChannel(player);
-                return sendMessage(player, CloudnodeMSG.getInstance().config().channelClosed(player.getName(), Optional.ofNullable(recipientOffline.getName()).orElse("Unknown Player"), label));
+            if (Message.hasChannel(player)) {
+                final @NotNull OfflinePlayer recipientOffline = CloudnodeMSG.getInstance().getServer().getOfflinePlayer(args[0]);
+                if (Message.getChannel(player).map(r -> r.getUniqueId().equals(recipientOffline.getUniqueId())).orElse(false)) {
+                    Message.exitChannel(player);
+                    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 (!Message.isIncomingEnabled(recipient.get())) return new PlayerHasIncomingDisabledError(recipient.get().getName()).send(player);