EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-25 06:36:45 +01:00
Code Issues Projects Releases Wiki Activity

Fixed some of the alias argument features.

Browse Source
This commit is contained in:
cerevisiae 2010-11-28 21:04:59 -06:00
parent 297c308d1a
commit 8a86cef94a
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
vminecraftCommands.java
View File

@ -36,6 +36,8 @@ public class vminecraftCommands{
cl.register("/ezmodo", "invuln", "Toggle invulnerability"); cl.register("/ezmodo", "invuln", "Toggle invulnerability");
cl.register("/ezlist", "ezlist", "List invulnerable players"); cl.register("/ezlist", "ezlist", "List invulnerable players");
cl.registerAlias("/playerlist", "/who"); cl.registerAlias("/playerlist", "/who");
cl.registerAlias("/it", "/i", new String[] {"%0", "100"});
cl.registerAlias("/wood", "/i", new String[] {"wood"});
} }
@ -820,27 +822,38 @@ class commandList {
//===================================================================== //=====================================================================
boolean call(Player player, String[] arg) boolean call(Player player, String[] arg)
{ {
String[] temp = args; if(args != null) {
if(args != null) String[] temp = new String[args.length];
{ System.arraycopy(args, 0, temp, 0, args.length);
//Insert the arguments into the pre-set arguments //Insert the arguments into the pre-set arguments
int lastSet = -1; int lastSet = 0,
for(int i = 0; i < temp.length; i++) argCount = 0;
if(temp[i].startsWith("%")) for(String argument : temp)
temp[i] = arg[lastSet = Integer.parseInt(temp[i].substring(1))];
//Append the rest of the arguments to the argument array
if(lastSet + 1 < arg.length)
{ {
String[] temp2 = new String[temp.length + arg.length - lastSet]; if(argument.startsWith("%"))
{
int argNum = Integer.parseInt(argument.substring(1));
if( argNum < arg.length )
{
temp[lastSet] = arg[argNum];
argCount++;
}
}
lastSet++;
}
//Append the rest of the arguments to the argument array
if(lastSet < temp.length + arg.length - argCount)
{
String[] temp2 = new String[temp.length + arg.length - argCount];
System.arraycopy(temp, 0, temp2, 0, temp.length); System.arraycopy(temp, 0, temp2, 0, temp.length);
System.arraycopy(arg, lastSet + 1, temp2, System.arraycopy(arg, argCount, temp2,
temp.length, arg.length - lastSet); temp.length, arg.length - argCount);
} temp = temp2;
} }
//Call the referenced command //Call the referenced command
if(temp != null)
player.command(reference + " " + etc.combineSplit(0, temp, " ")); player.command(reference + " " + etc.combineSplit(0, temp, " "));
else } else
player.command(reference); player.command(reference);
/*if(temp != null) /*if(temp != null)