Changed /is members and /is visitors to be commands of their own (#…

…1404)
BG-Software-LLC · Oct 13, 2022 · 4bcb220 · 4bcb220
1 parent 9b856ff
commit 4bcb220
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 5 deletions.
diff --git a/src/main/java/com/bgsoftware/superiorskyblock/commands/player/CmdMembers.java b/src/main/java/com/bgsoftware/superiorskyblock/commands/player/CmdMembers.java
@@ -1,6 +1,10 @@
 package com.bgsoftware.superiorskyblock.commands.player;
 
 import com.bgsoftware.superiorskyblock.SuperiorSkyblockPlugin;
+import com.bgsoftware.superiorskyblock.api.island.Island;
+import com.bgsoftware.superiorskyblock.api.wrappers.SuperiorPlayer;
+import com.bgsoftware.superiorskyblock.commands.arguments.CommandArguments;
+import com.bgsoftware.superiorskyblock.commands.arguments.IslandArgument;
 import com.bgsoftware.superiorskyblock.core.messages.Message;
 import com.bgsoftware.superiorskyblock.commands.ISuperiorCommand;
 import org.bukkit.command.CommandSender;
@@ -47,7 +51,16 @@ public boolean canBeExecutedByConsole() {
 
     @Override
     public void execute(SuperiorSkyblockPlugin plugin, CommandSender sender, String[] args) {
-        plugin.getCommands().dispatchSubCommand(sender, "panel", "members");
+        IslandArgument arguments = CommandArguments.getSenderIsland(plugin, sender);
+
+        Island island = arguments.getIsland();
+
+        if (island == null)
+            return;
+
+        SuperiorPlayer superiorPlayer = arguments.getSuperiorPlayer();
+
+        plugin.getMenus().openMembers(superiorPlayer, null, island);
     }
 
     @Override

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/commands/player/CmdPanel.java b/src/main/java/com/bgsoftware/superiorskyblock/commands/player/CmdPanel.java
@@ -64,10 +64,10 @@ public void execute(SuperiorSkyblockPlugin plugin, CommandSender sender, String[
 
         if (args.length > 1) {
             if (args[1].equalsIgnoreCase("members")) {
-                plugin.getMenus().openMembers(superiorPlayer, null, island);
+                plugin.getCommands().dispatchSubCommand(sender, "members");
                 return;
             } else if (args[1].equalsIgnoreCase("visitors")) {
-                plugin.getMenus().openVisitors(superiorPlayer, null, island);
+                plugin.getCommands().dispatchSubCommand(sender, "visitors");
                 return;
             } else if (args[1].equalsIgnoreCase("toggle")) {
                 if (!plugin.getEventsBus().callPlayerTogglePanelEvent(superiorPlayer))

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/commands/player/CmdVisitors.java b/src/main/java/com/bgsoftware/superiorskyblock/commands/player/CmdVisitors.java
@@ -1,8 +1,12 @@
 package com.bgsoftware.superiorskyblock.commands.player;
 
 import com.bgsoftware.superiorskyblock.SuperiorSkyblockPlugin;
-import com.bgsoftware.superiorskyblock.core.messages.Message;
+import com.bgsoftware.superiorskyblock.api.island.Island;
+import com.bgsoftware.superiorskyblock.api.wrappers.SuperiorPlayer;
 import com.bgsoftware.superiorskyblock.commands.ISuperiorCommand;
+import com.bgsoftware.superiorskyblock.commands.arguments.CommandArguments;
+import com.bgsoftware.superiorskyblock.commands.arguments.IslandArgument;
+import com.bgsoftware.superiorskyblock.core.messages.Message;
 import org.bukkit.command.CommandSender;
 
 import java.util.Collections;
@@ -47,7 +51,16 @@ public boolean canBeExecutedByConsole() {
 
     @Override
     public void execute(SuperiorSkyblockPlugin plugin, CommandSender sender, String[] args) {
-        plugin.getCommands().dispatchSubCommand(sender, "panel", "visitors");
+        IslandArgument arguments = CommandArguments.getSenderIsland(plugin, sender);
+
+        Island island = arguments.getIsland();
+
+        if (island == null)
+            return;
+
+        SuperiorPlayer superiorPlayer = arguments.getSuperiorPlayer();
+
+        plugin.getMenus().openVisitors(superiorPlayer, null, island);
     }
 
     @Override