Redstoner/CommandManager
Archived
0
Fork 0
Code Pull Requests Activity

magik

Browse Source
This commit is contained in:
NEMESIS13cz
2016-08-18 20:44:50 +02:00
parent 36c54e159f
commit 49016a10ae
3 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
com/nemez/cmdmgr/util/Executable.java
View File

@@ -44,6 +44,22 @@ public class Executable extends org.bukkit.command.Command {
for (HelpPageCommand cmd : page) {
if (cmd != null) {
processLine(cmd.usage.split("\\ "), cmd.permission, cmd.method, methods, methodContainer, plugin, cmd.type);
if (CommandManager.debugHelpMenu) {
continue;
}
String newUsage = "";
boolean ignore = false;
for (char c : cmd.usage.toCharArray()) {
if (c == ':' || c == '>') {
ignore = !ignore;
if (c == '>') {
newUsage += c;
}
}else if (!ignore) {
newUsage += c;
}
}
cmd.usage = newUsage;
}
}
}
@@ -169,7 +185,7 @@ public class Executable extends org.bukkit.command.Command {
if (annotations[0].hook().equals(methodArray[0])) {
Class<?>[] params = m.getParameterTypes();
if (params.length -1 != methodParams.size()) {
System.err.println("error again! :D");
plugin.getLogger().log(Level.WARNING, "Invalid method (" + methodArray[0] + "): Arguments don't match");
return;
}else{
for (int i = 0; i < params.length; i++) {
@@ -292,9 +308,13 @@ public class Executable extends org.bukkit.command.Command {
HelpPageCommand[] pageData = help.get(page);
sender.sendMessage(CommandManager.helpPageHeaderFormatting + "### Help Page " + (page + 1) + "/" + (help.size()) + " ###");
for (HelpPageCommand c : pageData) {
if (c != null && (c.permission == null || sender.hasPermission(c.permission))) {
sender.sendMessage(CommandManager.helpUsageFormatting + c.usage);
sender.sendMessage(CommandManager.helpDescriptionFormatting + c.description);
if (c != null) {
if (c.type == null || c.type == Type.BOTH || (c.type == Type.CONSOLE && !(sender instanceof Player)) || (c.type == Type.PLAYER && sender instanceof Player)) {
if (c.permission == null || sender.hasPermission(c.permission)) {
sender.sendMessage(CommandManager.helpUsageFormatting + c.usage);
sender.sendMessage(CommandManager.helpDescriptionFormatting + c.description);
}
}
}
}
}