Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-01-07 08:58:27 +01:00
Code Issues Projects Releases Wiki Activity

Runs player go and create commands as direct calls.

Browse Source 
Avoids performCommand because it can be trapped as a cheat because it
executes too fast. Allows use of non-subcommands.
This commit is contained in:
tastybento 2021-05-13 07:37:41 -07:00
parent 10a51a5874
commit 2bc35c8936
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/world/bentobox/bentobox/api/commands/island/DefaultPlayerCommand.java
View File

@ -99,31 +99,25 @@ public abstract class DefaultPlayerCommand extends CompositeCommand {
// Check if user has an island.
if (this.getIslands().getIsland(this.getWorld(), user.getUniqueId()) != null) {
// Default command if user has an island.
String command = this.<GameModeAddon>getAddon().getWorldSettings().getDefaultPlayerAction();
// Perform command or use "go" command.
if (command != null && user.performCommand(label + " " + command)) {
return true;
}
else {
return this.getSubCommand("go").
map(goCmd -> goCmd.call(user, goCmd.getLabel(), Collections.emptyList())).
orElse(false);
}
}
else {
return runCommand(user, label, this.<GameModeAddon>getAddon().getWorldSettings().getDefaultPlayerAction(), "go");
} else {
// Default command if user does not have an island.
String command = this.<GameModeAddon>getAddon().getWorldSettings().getDefaultNewPlayerAction();
return runCommand(user, label, this.<GameModeAddon>getAddon().getWorldSettings().getDefaultNewPlayerAction(), "create");
}
}
// Perform command or use "create" command.
if (command != null && user.performCommand(label + " " + command)) {
return true;
}
else {
return this.getSubCommand("create").
map(createCmd -> createCmd.call(user, createCmd.getLabel(), Collections.emptyList())).
orElse(false);
}
private boolean runCommand(User user, String label, String command, String defaultSubCommand) {
if (command == null || command.isEmpty()) {
command = defaultSubCommand;
}
// Call sub command or perform command if it does not exist
if (this.getSubCommand(command).isPresent()) {
return this.getSubCommand(command).
map(c -> c.call(user, c.getLabel(), Collections.emptyList())).
orElse(false);
} else {
// Command is not a sub command - perform it directly
return user.performCommand(command);
}
}
}