Fixed websocket message mention detection

2016-10-04 13:37:40 -03:00
parent 857255abde
commit c67bd04c5a
2 changed files with 7 additions and 3 deletions
--- a/src/Discord.Net.Core/Utils/MentionsHelper.cs
+++ b/src/Discord.Net.Core/Utils/MentionsHelper.cs
@@ -62,6 +62,9 @@ namespace Discord
        internal static ImmutableArray<TRole> GetRoleMentions<TRole>(string text, IGuild guild)
            where TRole : class, IRole
        {
+            if (guild == null)
+                return ImmutableArray.Create<TRole>();
+
            var matches = _roleRegex.Matches(text);
            var builder = ImmutableArray.CreateBuilder<TRole>(matches.Count);
            foreach (var match in matches.OfType<Match>())