Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug in useageTemplate and a bug with required args from console.

Browse Source
This commit is contained in:
Magnus Ulf 2015-05-07 21:05:08 +02:00 committed by Olof Larsson
parent 6f8da0a9f8
commit d7fcef6c3d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/massivecraft/massivecore/cmd/ArgSetting.java
View File

@ -30,7 +30,7 @@ public class ArgSetting
// Is this arg ALWAYS required from the console? // Is this arg ALWAYS required from the console?
// That might the case if the arg is a player. and default is oneself. // That might the case if the arg is a player. and default is oneself.
protected boolean requiredFromConsole = false; protected boolean requiredFromConsole = false;
public boolean isRequiredFromConsole() { return requiredFromConsole && this.isRequired(); } public boolean isRequiredFromConsole() { return requiredFromConsole; }
public ArgSetting setRequiredFromConsole(boolean requiredFromConsole) { this.requiredFromConsole = requiredFromConsole; return this; } public ArgSetting setRequiredFromConsole(boolean requiredFromConsole) { this.requiredFromConsole = requiredFromConsole; return this; }
// An optional description of this argument. // An optional description of this argument.

4
src/com/massivecraft/massivecore/cmd/MassiveCommand.java
View File

@ -633,7 +633,7 @@ public class MassiveCommand
} }
// Ensure that the required args are filled. // Ensure that the required args are filled.
for (int i = 0; i < this.getRequiredArgsAmountFor(sender);i++) for (int i = 0; i < this.getRequiredArgsAmountFor(sender); i++)
{ {
if (ret[i] != null) continue; if (ret[i] != null) continue;
// We end up here if an required arg wasn't filled. In that case we failed. // We end up here if an required arg wasn't filled. In that case we failed.
@ -892,7 +892,7 @@ public class MassiveCommand
public String getUseageTemplate(List<MassiveCommand> commandChain, boolean addDesc, boolean onlyFirstAlias) public String getUseageTemplate(List<MassiveCommand> commandChain, boolean addDesc, boolean onlyFirstAlias)
{ {
return getUseageTemplate(commandChain, addDesc, onlyFirstAlias, null); return getUseageTemplate(commandChain, addDesc, onlyFirstAlias, sender);
} }
public String getUseageTemplate(List<MassiveCommand> commandChain, boolean addDesc) public String getUseageTemplate(List<MassiveCommand> commandChain, boolean addDesc)