patches

Author: Neeonn

src/main/java/io/github/divinerealms/core/commands/ChannelCommand.java

@@ -90,9 +90,14 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
         Player switchingPlayer = (Player) sender;
         String channelToSwitchTo = args[1];
         if (!channelManager.getChannels().containsKey(channelToSwitchTo.toLowerCase())) { logger.send(sender, Lang.CHANNEL_NOT_FOUND.replace(new String[]{channelToSwitchTo})); return true; }
-
-        boolean switchedStatus = channelManager.switchChannel(switchingPlayer.getUniqueId(), channelToSwitchTo.toLowerCase());
-        logger.send(switchingPlayer, Lang.CHANNEL_TOGGLE.replace(new String[]{channelToSwitchTo.toUpperCase(), switchedStatus ? Lang.ON.replace(null) : Lang.OFF.replace(null)}));
+        if (channelManager.isChannelDisabled(channelToSwitchTo)) { logger.send(sender, Lang.CHANNEL_DISABLED.replace(new String[]{channelToSwitchTo.toUpperCase()})); return true; }
+        if (!channelManager.getChannels(switchingPlayer.getUniqueId()).contains(channelToSwitchTo.toLowerCase())) { logger.send(sender, Lang.CHANNEL_NOT_SUBSCRIBED.replace(new String[]{channelToSwitchTo.toUpperCase()})); return true; }
+        channelManager.setLastChannelUsed(switchingPlayer.getUniqueId(), channelToSwitchTo.toLowerCase());
+        String currentChannel = channelManager.getActiveChannel(switchingPlayer);
+        boolean alreadyActive = channelToSwitchTo.equalsIgnoreCase(currentChannel);
+
+        channelManager.setLastActiveChannel(switchingPlayer.getUniqueId(), alreadyActive ? channelManager.getDefaultChannel() : channelToSwitchTo.toLowerCase());
+        logger.send(switchingPlayer, Lang.CHANNEL_TOGGLE.replace(new String[]{channelToSwitchTo.toUpperCase(), alreadyActive ? Lang.OFF.replace(null) : Lang.ON.replace(null)}));
         break;
 
       case "status":
@@ -101,6 +106,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
         if (args.length < 2) { logger.send(sender, Lang.CHANNEL_HELP.replace(null)); return true; }
 
         Player statusPlayer = Bukkit.getPlayer(args[1]);
+        if (statusPlayer == null || !statusPlayer.isOnline()) { logger.send(sender, Lang.PLAYER_NOT_FOUND.replace(new String[]{args[1]})); return true; }
         Set<String> subscribedChannels = channelManager.getChannels(statusPlayer.getUniqueId());
         String activeChannel = channelManager.getActiveChannel(statusPlayer);
         String subsList = subscribedChannels.stream()

version.properties

@@ -2,4 +2,4 @@
 #Sat Oct 11 15:09:00 CEST 2025
 patch=2
 major=1
-minor=10
+minor=11