EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-08-03 04:55:27 +02:00
Code Issues Projects Releases Wiki Activity

Fixes #1015

Browse Source
This commit is contained in:
Jesse Boyd
2016-03-29 17:39:29 +11:00
parent 5f8a55568c
commit eed8cbec5a
6 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,6 @@ import com.intellectualcrafters.plot.util.MathMan;
import com.intellectualcrafters.plot.util.Permissions;
import com.intellectualcrafters.plot.util.StringComparison;
import com.intellectualcrafters.plot.util.StringMan;
import java.io.IOException;
import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationTargetException;
@@ -323,7 +322,15 @@ public abstract class Command {
}
return;
}
Argument<?>[] reqArgs = cmd.getRequiredArguments();
String[] newArgs = Arrays.copyOfRange(args, 1, args.length);
if (!cmd.checkArgs(player, newArgs) || !cmd.canExecute(player, true)) {
return;
}
cmd.execute(player, newArgs, confirm, whenDone);
}
public boolean checkArgs(PlotPlayer player, String[] args) {
Argument<?>[] reqArgs = getRequiredArguments();
if ((reqArgs != null) && (reqArgs.length > 0)) {
boolean failed = args.length < reqArgs.length;
String[] baseSplit = getCommandString().split(" ");
@@ -335,13 +342,10 @@ public abstract class Command {
}
if (failed) {
C.COMMAND_SYNTAX.send(player, StringMan.join(fullSplit, " "));
return;
return false;
}
}
if (!cmd.canExecute(player, true)) {
return;
}
cmd.execute(player, Arrays.copyOfRange(args, 1, args.length), confirm, whenDone);
return true;
}
public int getMatch(String[] args, Command cmd) {