improvements to the args system when no args are given.
This commit is contained in:
parent
48fd3f6e0d
commit
fa0b2211dc
1 changed files with 7 additions and 3 deletions
|
|
@ -212,9 +212,14 @@ namespace BSB.Commands
|
||||||
if (cmd != null)
|
if (cmd != null)
|
||||||
{
|
{
|
||||||
cmd.Setup(bot, caller);
|
cmd.Setup(bot, caller);
|
||||||
|
string[] args = new string[] { };
|
||||||
|
if (helpers.notempty(arg) == true)
|
||||||
|
{
|
||||||
|
args = arg.Split(new string[] { "~#~" }, StringSplitOptions.None);
|
||||||
|
}
|
||||||
if ((cmd.ArgTypes.Contains("Avatar") == true) || (cmd.ArgTypes.Contains("Smart") == true))
|
if ((cmd.ArgTypes.Contains("Avatar") == true) || (cmd.ArgTypes.Contains("Smart") == true))
|
||||||
{
|
{
|
||||||
string[] args = arg.Split(new string[] { "~#~" }, StringSplitOptions.None);
|
|
||||||
if (cmd.MinArgs <= args.Length)
|
if (cmd.MinArgs <= args.Length)
|
||||||
{
|
{
|
||||||
pending_avatar_lookup pending = new pending_avatar_lookup(this, cmd, args);
|
pending_avatar_lookup pending = new pending_avatar_lookup(this, cmd, args);
|
||||||
|
|
@ -241,7 +246,7 @@ namespace BSB.Commands
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return cmd.CallFunction(arg.Split(new string[] { "~#~" }, StringSplitOptions.None));
|
return cmd.CallFunction(args);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
@ -253,7 +258,6 @@ namespace BSB.Commands
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
public bool Call(string command, string arg,UUID caller)
|
public bool Call(string command, string arg,UUID caller)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue