mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'wip' into 1.9

Browse Source
This commit is contained in:
Master Kwoth 2017-11-08 06:31:49 +01:00
commit c9f8b157bb
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NadekoBot.Core/Modules/Gambling/DiceRollCommands.cs
View File

@ -164,11 +164,8 @@ namespace NadekoBot.Modules.Gambling
int.TryParse(match.Groups["n2"].ToString(), out int n2) && int.TryParse(match.Groups["n2"].ToString(), out int n2) &&
n1 <= 50 && n2 <= 100000 && n1 > 0 && n2 > 0) n1 <= 50 && n2 <= 100000 && n1 > 0 && n2 > 0)
{ {
if (!int.TryParse(match.Groups["add"].Value, out int add) || int.TryParse(match.Groups["add"].Value, out int add);
!int.TryParse(match.Groups["sub"].Value, out int sub)) int.TryParse(match.Groups["sub"].Value, out int sub);
{
return;
}
var arr = new int[n1]; var arr = new int[n1];
for (int i = 0; i < n1; i++) for (int i = 0; i < n1; i++)

2
NadekoBot.Core/Modules/Games/PlantAndPickCommands.cs
View File

@ -91,7 +91,7 @@ namespace NadekoBot.Modules.Games
using (var toSend = imgData.ToStream()) using (var toSend = imgData.ToStream())
{ {
msg = await Context.Channel.SendFileAsync(toSend, "plant.png", msgToSend, options: new RequestOptions() msg = await Context.Channel.SendFileAsync(toSend, "plant.gif", msgToSend, options: new RequestOptions()
{ {
RetryMode = RetryMode.AlwaysRetry RetryMode = RetryMode.AlwaysRetry
}).ConfigureAwait(false); }).ConfigureAwait(false);

2
NadekoBot.Core/Modules/Games/Services/GamesService.cs
View File

@ -200,7 +200,7 @@ namespace NadekoBot.Modules.Games.Services
{ {
var sent = await channel.SendFileAsync( var sent = await channel.SendFileAsync(
fileStream, fileStream,
"drop.png", "drop.gif",
toSend).ConfigureAwait(false); toSend).ConfigureAwait(false);
msgs[0] = sent; msgs[0] = sent;