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

Minor code quality fixes in IslandCommand

Browse Source
This commit is contained in:
Florian CUNY 2018-02-18 11:32:25 +01:00
parent 43367300a4
commit f14676f5c6
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java
View File

@ -2,18 +2,11 @@ package us.tastybento.bskyblock.commands;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Optional;
import us.tastybento.bskyblock.Constants; import us.tastybento.bskyblock.Constants;
import us.tastybento.bskyblock.api.commands.CompositeCommand; import us.tastybento.bskyblock.api.commands.CompositeCommand;
import us.tastybento.bskyblock.api.commands.User; import us.tastybento.bskyblock.api.commands.User;
import us.tastybento.bskyblock.commands.island.IslandAboutCommand; import us.tastybento.bskyblock.commands.island.*;
import us.tastybento.bskyblock.commands.island.IslandCreateCommand;
import us.tastybento.bskyblock.commands.island.IslandGoCommand;
import us.tastybento.bskyblock.commands.island.IslandResetCommand;
import us.tastybento.bskyblock.commands.island.IslandResetnameCommand;
import us.tastybento.bskyblock.commands.island.IslandSethomeCommand;
import us.tastybento.bskyblock.commands.island.IslandSetnameCommand;
import us.tastybento.bskyblock.commands.island.teams.IslandTeamCommand; import us.tastybento.bskyblock.commands.island.teams.IslandTeamCommand;
public class IslandCommand extends CompositeCommand { public class IslandCommand extends CompositeCommand {
@ -39,25 +32,23 @@ public class IslandCommand extends CompositeCommand {
new IslandSetnameCommand(this); new IslandSetnameCommand(this);
new IslandResetnameCommand(this); new IslandResetnameCommand(this);
new IslandSethomeCommand(this); new IslandSethomeCommand(this);
new IslandSettingsCommand(this);
// Team commands // Team commands
new IslandTeamCommand(this); new IslandTeamCommand(this);
} }
/* (non-Javadoc)
* @see us.tastybento.bskyblock.api.commands.CommandArgument#execute(org.bukkit.command.CommandSender, java.lang.String[])
*/
@Override @Override
public boolean execute(User user, List<String> args) { public boolean execute(User user, List<String> args) {
// If this player does not have an island, create one // If this player does not have an island, create one
if (!getPlugin().getIslands().hasIsland(user.getUniqueId())) { if (!getPlugin().getIslands().hasIsland(user.getUniqueId())) {
Optional<CompositeCommand> subCreate = getSubCommand("create"); getSubCommand("create").ifPresent(createCmd -> execute(user, new ArrayList<>()));
if (subCreate.isPresent()) {
subCreate.get().execute(user, new ArrayList<>());
}
return true; return true;
} }
Optional<CompositeCommand> go = getSubCommand("go");
// Otherwise, currently, just go home // Otherwise, currently, just go home
if (go.isPresent()) { getSubCommand("go").ifPresent(goCmd -> execute(user, new ArrayList<>()));
go.get().execute(user, new ArrayList<>());
}
return true; return true;
} }

4
src/main/java/us/tastybento/bskyblock/commands/island/IslandGoCommand.java
View File

@ -16,7 +16,6 @@ import us.tastybento.bskyblock.util.Util;
/** /**
* @author tastybento * @author tastybento
*
*/ */
public class IslandGoCommand extends CompositeCommand { public class IslandGoCommand extends CompositeCommand {
@ -24,6 +23,9 @@ public class IslandGoCommand extends CompositeCommand {
super(islandCommand, "go", "home", "h"); super(islandCommand, "go", "home", "h");
} }
/* (non-Javadoc)
* @see us.tastybento.bskyblock.api.commands.CompositeCommand#setup()
*/
@Override @Override
public void setup() { public void setup() {
setPermission(Constants.PERMPREFIX + "island.home"); setPermission(Constants.PERMPREFIX + "island.home");