Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-12-26 17:18:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

3.3.2

Browse Source
This commit is contained in:
Jesse Boyd 2016-03-27 03:34:55 +11:00
parent d4d9a9e148
commit 056f77a3ba
7 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/main/java/com/intellectualcrafters/plot/commands/Help.java
View File

@ -13,7 +13,7 @@ import com.plotsquared.general.commands.CommandDeclaration;
@CommandDeclaration(command = "help",
description = "Get this help menu",
aliases = {"he", "h", "?"},
aliases = {"he", "?"},
category = CommandCategory.INFO,
usage="help [category|#]",
permission="plots.use")
@ -23,7 +23,7 @@ public class Help extends Command {
}
@Override
public boolean canExecute(PlotPlayer player) {
public boolean canExecute(PlotPlayer player, boolean message) {
return true;
}

2
Core/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java
View File

@ -240,7 +240,7 @@ public class MainCommand extends Command {
}
@Override
public boolean canExecute(PlotPlayer player) {
public boolean canExecute(PlotPlayer player, boolean message) {
return true;
}
}

2
Core/src/main/java/com/intellectualcrafters/plot/commands/Merge.java
View File

@ -92,7 +92,7 @@ public class Merge extends SubCommand {
}
}
final PlotArea plotworld = plot.getArea();
final double price = plotworld.PRICES.get("merge");
final double price = plotworld.PRICES.containsKey("merge") ? plotworld.PRICES.get("merge") : 0;
if (EconHandler.manager != null && plotworld.USE_ECONOMY && price > 0d && EconHandler.manager.getMoney(plr) < price) {
sendMessage(plr, C.CANNOT_AFFORD_MERGE, price + "");
return false;

52
Core/src/main/java/com/plotsquared/general/commands/Command.java
View File

@ -62,7 +62,7 @@ public abstract class Command {
public List<Command> getCommands(PlotPlayer player) {
List<Command> commands = new ArrayList<>();
for (Command cmd : allCommands) {
if (cmd.canExecute(player)) {
if (cmd.canExecute(player, false)) {
commands.add(cmd);
}
}
@ -322,23 +322,22 @@ public abstract class Command {
}
return;
}
if (!cmd.canExecute(player)) {
Argument<?>[] reqArgs = cmd.getRequiredArguments();
if ((reqArgs != null) && (reqArgs.length > 0)) {
boolean failed = args.length > reqArgs.length;
String[] baseSplit = getCommandString().split(" ");
String[] fullSplit = getUsage().split(" ");
String base = getCommandString();
for (int i = 0; i < reqArgs.length; i++) {
fullSplit[i + baseSplit.length] = reqArgs[i].getExample().toString();
failed = failed || reqArgs[i].parse(args[i]) == null;
}
if (failed) {
C.COMMAND_SYNTAX.send(player, StringMan.join(fullSplit, " "));
return;
}
Argument<?>[] reqArgs = cmd.getRequiredArguments();
if ((reqArgs != null) && (reqArgs.length > 0)) {
boolean failed = args.length > reqArgs.length;
String[] baseSplit = getCommandString().split(" ");
String[] fullSplit = getUsage().split(" ");
String base = getCommandString();
for (int i = 0; i < reqArgs.length; i++) {
fullSplit[i + baseSplit.length] = reqArgs[i].getExample().toString();
failed = failed || reqArgs[i].parse(args[i]) == null;
}
C.NO_PERMISSION.send(player, cmd.getPermission());
if (failed) {
C.COMMAND_SYNTAX.send(player, StringMan.join(fullSplit, " "));
return;
}
}
if (!cmd.canExecute(player, true)) {
return;
}
cmd.execute(player, Arrays.copyOfRange(args, 1, args.length), confirm, whenDone);
@ -395,8 +394,19 @@ public abstract class Command {
return cmd;
}
public boolean canExecute(PlotPlayer player) {
return required.allows(player) && Permissions.hasPermission(player, getPermission());
public boolean canExecute(PlotPlayer player, boolean message) {
if (!required.allows(player)) {
if (message) {
MainUtil.sendMessage(player, required == RequiredType.PLAYER ? C.IS_CONSOLE : C.NOT_CONSOLE);
}
} else if (!Permissions.hasPermission(player, getPermission())) {
if (message) {
C.NO_PERMISSION.send(player, getPermission());
}
} else {
return true;
}
return false;
}
public boolean matches(String arg) {
@ -440,11 +450,11 @@ public abstract class Command {
String arg = args[0].toLowerCase();
if (space) {
Command cmd = getCommand(arg);
return (cmd != null && cmd.canExecute(player)) ? (cmd.tab(player, Arrays.copyOfRange(args, 1, args.length), space)) : null;
return (cmd != null && cmd.canExecute(player, false)) ? (cmd.tab(player, Arrays.copyOfRange(args, 1, args.length), space)) : null;
} else {
Set<Command> commands = new HashSet<Command>();
for (Map.Entry<String, Command> entry : staticCommands.entrySet()) {
if (entry.getKey().startsWith(arg) && entry.getValue().canExecute(player)) {
if (entry.getKey().startsWith(arg) && entry.getValue().canExecute(player, false)) {
commands.add(entry.getValue());
}
}

4
Sponge/src/main/java/com/plotsquared/sponge/util/SpongeCommand.java
View File

@ -55,8 +55,8 @@ public class SpongeCommand implements CommandCallable {
final Set<String> tabOptions = new HashSet<>();
final String arg = split[0].toLowerCase();
ArrayList<String> labels = new ArrayList<>();
for (final Command<PlotPlayer> cmd : MainCommand.getInstance().getCommands()) {
final String label = cmd.getCommand();
for (final Command cmd : MainCommand.getInstance().getCommands()) {
final String label = cmd.toS();
HashSet<String> aliases = new HashSet<>(cmd.getAliases());
aliases.add(label);
for (String alias : aliases) {

2
build.gradle
View File

@ -10,7 +10,7 @@ buildscript {
}
group = 'com.intellectualcrafters'
version = '3.3.1'
version = '3.3.2'
description = """PlotSquared"""
subprojects {

2
pom.xml
View File

@ -6,7 +6,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<artifactId>PlotSquared</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
<name>PlotSquared</name>
<packaging>jar</packaging>
<build>