github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed Min/MaxArgs

Browse Source
This commit is contained in:
RogueException
2015-11-09 03:01:22 -04:00
parent 2126c43e1c
commit c09c41599a
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Discord.Net.Commands/CommandParser.cs
View File

@@ -78,10 +78,7 @@ namespace Discord.Commands
{
if (startPosition == endPosition && (parameter == null || parameter.Type != ParameterType.Multiple)) //Is first char of a new arg
{
if (argList.Count == command.MaxArgs)
return CommandErrorType.BadArgCount;
parameter = command._parameters[argList.Count];
parameter = expectedArgs[argList.Count];
if (parameter.Type == ParameterType.Unparsed)
{
argList.Add(input.Substring(startPosition));
@@ -147,9 +144,9 @@ namespace Discord.Commands
}
}
for (int i = argList.Count; i < command._parameters.Length; i++)
for (int i = argList.Count; i < expectedArgs.Length; i++)
{
var param = command._parameters[i];
var param = expectedArgs[i];
switch (param.Type)
{
case ParameterType.Required:
@@ -161,6 +158,12 @@ namespace Discord.Commands
}
}
if (argList.Count > expectedArgs.Length)
{
if (expectedArgs.Length == 0 || expectedArgs[expectedArgs.Length - 1].Type != ParameterType.Multiple)
return CommandErrorType.BadArgCount;
}
args = argList.ToArray();
return null;
}