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

Fixed crash with short mention activation strings

Browse Source
This commit is contained in:
RogueException
2016-02-14 13:45:58 -04:00
parent b5f4e1004d
commit 173df19439
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Discord.Net.Commands/CommandService.cs
View File

@@ -97,10 +97,15 @@ namespace Discord.Commands
//Check for mention //Check for mention
if (cmdMsg == null && Config.AllowMentionPrefix) if (cmdMsg == null && Config.AllowMentionPrefix)
{ {
if (msg.StartsWith(client.CurrentUser.Mention)) string mention = client.CurrentUser.Mention;
cmdMsg = msg.Substring(client.CurrentUser.Mention.Length + 1); if (msg.StartsWith(mention) && msg.Length > mention.Length)
else if (msg.StartsWith($"@{client.CurrentUser.Name}")) cmdMsg = msg.Substring(mention.Length + 1);
cmdMsg = msg.Substring(client.CurrentUser.Name.Length + 1); else
{
mention = $"@{client.CurrentUser.Name}";
if (msg.StartsWith(mention) && msg.Length > mention.Length)
cmdMsg = msg.Substring(mention.Length + 1);
}
} }
//Check using custom activator //Check using custom activator