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

Fixed GetChannelMessagesAsync nullref error

Browse Source
This commit is contained in:
RogueException
2016-07-13 11:35:11 -03:00
parent 753813f040
commit 54e0cc0948
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Discord.Net/API/DiscordAPIClient.cs
View File

@@ -926,7 +926,8 @@ namespace Discord.API
default: default:
result[i] = models; result[i] = models;
relativeId = ulong.MaxValue; relativeId = ulong.MaxValue;
for (int j = 0; j < models.Length; j++) //Lowest id *should* be the last one
for (int j = models.Length - 1; j >= 0; j--)
{ {
if (models[j].Id < relativeId.Value) if (models[j].Id < relativeId.Value)
relativeId = models[j].Id; relativeId = models[j].Id;
@@ -935,6 +936,7 @@ namespace Discord.API
case Direction.After: case Direction.After:
result[runs - i - 1] = models; result[runs - i - 1] = models;
relativeId = ulong.MinValue; relativeId = ulong.MinValue;
//Highest id *should* be the first one
for (int j = 0; j < models.Length; j++) for (int j = 0; j < models.Length; j++)
{ {
if (models[j].Id > relativeId.Value) if (models[j].Id > relativeId.Value)
@@ -960,7 +962,17 @@ namespace Discord.API
} }
} }
else if (i == 1) else if (i == 1)
return result[0]; {
switch (args.RelativeDirection)
{
case Direction.Before:
case Direction.Around:
default:
return result[0];
case Direction.After:
return result[runs - 1];
}
}
else else
return ImmutableArray.Create<Message>(); return ImmutableArray.Create<Message>();
} }