EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-29 08:36:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/dmodoomsirius/PlotSquared

Browse Source
This commit is contained in:
dmodoomsirius 2016-03-29 03:59:42 -04:00
commit 5ec6bc62ca
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Core/src/main/java/com/intellectualcrafters/plot/commands/Kick.java
View File

@ -35,6 +35,7 @@ import com.plotsquared.general.commands.CommandDeclaration;
aliases = {"k"}, aliases = {"k"},
description = "Kick a player from your plot", description = "Kick a player from your plot",
permission = "plots.kick", permission = "plots.kick",
usage = "<player>",
category = CommandCategory.TELEPORT, category = CommandCategory.TELEPORT,
requiredType = RequiredType.PLAYER) requiredType = RequiredType.PLAYER)
public class Kick extends SubCommand { public class Kick extends SubCommand {

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

@ -336,6 +336,11 @@ public abstract class Command {
String[] baseSplit = getCommandString().split(" "); String[] baseSplit = getCommandString().split(" ");
String[] fullSplit = getUsage().split(" "); String[] fullSplit = getUsage().split(" ");
String base = getCommandString(); String base = getCommandString();
if (fullSplit.length - baseSplit.length < reqArgs.length) {
String[] tmp = new String[baseSplit.length + reqArgs.length];
System.arraycopy(fullSplit, 0, tmp, 0, fullSplit.length);
fullSplit = tmp;
}
for (int i = 0; i < reqArgs.length; i++) { for (int i = 0; i < reqArgs.length; i++) {
fullSplit[i + baseSplit.length] = reqArgs[i].getExample().toString(); fullSplit[i + baseSplit.length] = reqArgs[i].getExample().toString();
failed = failed || reqArgs[i].parse(args[i]) == null; failed = failed || reqArgs[i].parse(args[i]) == null;