Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-10-03 17:17:32 +02:00
Code Issues Projects Releases Wiki Activity

Fixed issue where Optional was not being explicitly checked before get.

Browse Source
This commit is contained in:
Tastybento 2018-02-06 21:31:59 -08:00
parent 2d64070d3f
commit fdc7a62990
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/us/tastybento/bskyblock/api/commands/CompositeCommand.java
View File

@ -173,7 +173,7 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi
if (event.isCancelled()) { if (event.isCancelled()) {
return true; return true;
} }
// Execute and trim args // Execute and trim args
return cmd.execute(user, Arrays.asList(args).subList(cmd.subCommandLevel, args.length)); return cmd.execute(user, Arrays.asList(args).subList(cmd.subCommandLevel, args.length));
} }
@ -195,17 +195,17 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi
// get the subcommand corresponding to the arg // get the subcommand corresponding to the arg
if (subCommand.hasSubCommmands()) { if (subCommand.hasSubCommmands()) {
if (DEBUG) if (DEBUG)
Bukkit.getLogger().info("DEBUG: This command has subcommands"); Bukkit.getLogger().info("DEBUG: This command has subcommands");
if (subCommand.getSubCommand(args[i]).isPresent()) { Optional<CompositeCommand> sub = subCommand.getSubCommand(args[i]);
// Step down one if (!sub.isPresent()) {
subCommand = subCommand.getSubCommand(args[i]).get();
if (DEBUG)
Bukkit.getLogger().info("DEBUG: Moved to " + subCommand.getLabel());
// Set the label
subCommand.setLabel(args[i]);
} else {
return subCommand; return subCommand;
} }
// Step down one
subCommand = sub.orElse(subCommand);
if (DEBUG)
Bukkit.getLogger().info("DEBUG: Moved to " + subCommand.getLabel());
// Set the label
subCommand.setLabel(args[i]);
} else { } else {
// We are at the end of the walk // We are at the end of the walk
if (DEBUG) if (DEBUG)