From 7f45f08b32a0e9f6976091a8888d201a50ac66cd Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Fri, 30 Dec 2016 23:38:47 +0100 Subject: [PATCH] Fixed subcommands --- .../java/buttondevteam/lib/chat/TBMCChatAPI.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java b/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java index 3ed861d..b6317ee 100644 --- a/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java +++ b/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java @@ -61,17 +61,17 @@ public class TBMCChatAPI { }; for (TBMCCommandBase cmd : TBMCChatAPI.GetCommands().values()) { if (cmd.GetCommandPath().startsWith(command + " ")) { + if (cmd.GetPlayerOnly() && !(sender instanceof Player)) + continue; + if (cmd.GetModOnly() && !MainPlugin.permission.has(sender, "tbmc.admin")) + continue; int ind = cmd.GetCommandPath().indexOf(' ', command.length() + 2); if (ind >= 0) { String newcmd = cmd.GetCommandPath().substring(0, ind); if (!cmds.contains("/" + newcmd)) addToCmds.accept("/" + newcmd); - } - if (cmd.GetPlayerOnly() && !(sender instanceof Player)) - continue; - if (cmd.GetModOnly() && !MainPlugin.permission.has(sender, "tbmc.admin")) - continue; - addToCmds.accept("/" + cmd.GetCommandPath()); + } else + addToCmds.accept("/" + cmd.GetCommandPath()); } } return cmds.toArray(new String[cmds.size()]);