Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-11-28 13:45:14 +01:00
Code Issues Projects Releases Wiki Activity

Prepared automated showHelp if #execute() was returning false

Browse Source 
I added the code, however I commented it out: there are a few problems with this for now, because some commands are using "return false;" to fail silently.

Also did javadoc'd #onlyPlayer(boolean)
This commit is contained in:
Florian CUNY 2018-08-09 17:09:38 +02:00
parent ceb88d9c7b
commit 48b169537a
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java
View File

@ -223,7 +223,13 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi
return false; return false;
} }
// Execute and trim args // Execute and trim args
return cmd.execute(user, (cmd.subCommandLevel > 0) ? args[cmd.subCommandLevel-1] : label, Arrays.asList(args).subList(cmd.subCommandLevel, args.length)); if (!cmd.execute(user, (cmd.subCommandLevel > 0) ? args[cmd.subCommandLevel-1] : label, Arrays.asList(args).subList(cmd.subCommandLevel, args.length))) {
// If it returned false, then show help for this command
// showHelp(cmd, user);
return false; // And return false (it basically does nothing, but let's be compliant with Bukkit's javadoc)
} else {
return true;
}
} }
/** /**
@ -441,8 +447,12 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi
} }
/** /**
* Set whether this command is only for players * Sets whether this command should only be run by players.
* @param onlyPlayer - true if command only for players * If this is set to {@code true}, this command will only be runnable by objects implementing {@link Player}.
* <br/><br/>
* The default value provided when instantiating this CompositeCommand is {@code false}.
* Therefore, this method should only be used in case you want to explicitly edit the value.
* @param onlyPlayer {@code true} if this command should only be run by players.
*/ */
public void setOnlyPlayer(boolean onlyPlayer) { public void setOnlyPlayer(boolean onlyPlayer) {
this.onlyPlayer = onlyPlayer; this.onlyPlayer = onlyPlayer;