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

Big bugs fixed

Browse Source
This commit is contained in:
Master Kwoth 2016-01-31 06:42:38 +01:00
parent dbeb2b55ab
commit 548aadabfb
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NadekoBot/Modules/Conversations.cs
View File

@ -324,7 +324,8 @@ namespace NadekoBot.Modules {
.Do(async e => { .Do(async e => {
string str = "Bye"; string str = "Bye";
foreach (var u in e.Message.MentionedUsers) { foreach (var u in e.Message.MentionedUsers) {
str += " " + u.Mention; if(u.Id != NadekoBot.client.CurrentUser.Id)
str += " " + u.Mention;
} }
await e.Send(str); await e.Send(str);
}); });

4
NadekoBot/Modules/Music.cs
View File

@ -94,9 +94,9 @@ namespace NadekoBot.Modules {
} }
try { try {
if (player.VoiceChannel.Server != e.Server) if (e.User.VoiceChannel?.Server != e.Server)
throw new ArgumentException("You need to be in the voice channel on this server."); throw new ArgumentException("You need to be in the voice channel on this server.");
var sr = await player.CreateStreamRequest(e, e.GetArg("query"), player.VoiceChannel); var sr = await player.CreateStreamRequest(e, e.GetArg("query"), e.User.VoiceChannel);
if (sr == null) if (sr == null)
throw new NullReferenceException("StreamRequest is null."); throw new NullReferenceException("StreamRequest is null.");
Message msg = null; Message msg = null;