funkemunky/commands
1
0
Fork 0
mirror of https://github.com/aikar/commands.git synced 2026-05-31 14:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only register Unknown/Default for HelpCommand if not already set

Browse Source
This commit is contained in:
Aikar
2017-08-24 01:21:50 -04:00
parent dcbdf0b594
commit 34642136f5
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/co/aikar/commands/BaseCommand.java
+8 -4
View File
@@ -129,10 +129,12 @@ public abstract class BaseCommand {
final CommandAlias commandAliases = method.getAnnotation(CommandAlias.class);
if (def != null || helpCommand != null) {
if (def != null || (!foundDefault && helpCommand != null)) {
if (!foundDefault) {
registerSubcommand(method, DEFAULT);
foundDefault = true;
if (def != null) {
foundDefault = true;
}
} else {
ACFUtil.sneaky(new IllegalStateException("Multiple @Default/@HelpCommand commands, duplicate on " + method.getDeclaringClass().getName() + "#" + method.getName()));
}
@@ -148,10 +150,12 @@ public abstract class BaseCommand {
UnknownHandler unknown = method.getAnnotation(UnknownHandler.class);
PreCommand preCommand = method.getAnnotation(PreCommand.class);
if (unknown != null || helpCommand != null) {
if (unknown != null || (!foundUnknown && helpCommand != null)) {
if (!foundUnknown) {
registerSubcommand(method, UNKNOWN);
foundUnknown = true;
if (unknown != null) {
foundUnknown = true;
}
} else {
ACFUtil.sneaky(new IllegalStateException("Multiple @UnknownHandler/@HelpCommand commands, duplicate on " + method.getDeclaringClass().getName() + "#" + method.getName()));
}