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

This commit is contained in:
Tastybento 2018-02-06 21:31:59 -08:00
parent 2d64070d3f
commit fdc7a62990

View File

@ -196,16 +196,16 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi
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]);
if (!sub.isPresent()) {
return subCommand;
}
// Step down one // Step down one
subCommand = subCommand.getSubCommand(args[i]).get(); subCommand = sub.orElse(subCommand);
if (DEBUG) if (DEBUG)
Bukkit.getLogger().info("DEBUG: Moved to " + subCommand.getLabel()); Bukkit.getLogger().info("DEBUG: Moved to " + subCommand.getLabel());
// Set the label // Set the label
subCommand.setLabel(args[i]); subCommand.setLabel(args[i]);
} else {
return subCommand;
}
} else { } else {
// We are at the end of the walk // We are at the end of the walk
if (DEBUG) if (DEBUG)