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

Fixed some race conditions

Browse Source
This commit is contained in:
RogueException
2015-10-22 23:26:08 -03:00
parent c03095cda7
commit 722ba1cc91
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Discord.Net/DiscordClient.cs
View File

@@ -592,6 +592,8 @@ namespace Discord
{ {
var data = e.Payload.ToObject<TypingStartEvent>(_serializer); var data = e.Payload.ToObject<TypingStartEvent>(_serializer);
var channel = _channels[data.ChannelId]; var channel = _channels[data.ChannelId];
if (channel != null)
{
var user = _members[data.UserId, channel.ServerId]; var user = _members[data.UserId, channel.ServerId];
if (user != null) if (user != null)
@@ -615,6 +617,7 @@ namespace Discord
} }
} }
} }
}
break; break;
//Voice //Voice

2
src/Discord.Net/Models/Member.cs
View File

@@ -186,7 +186,7 @@ namespace Discord
{ {
//Set roles, with the everyone role added too //Set roles, with the everyone role added too
string[] newRoles = new string[roleIds.Length + 1]; string[] newRoles = new string[roleIds.Length + 1];
newRoles[0] = Server.EveryoneRoleId; newRoles[0] = ServerId; //Everyone
for (int i = 0; i < roleIds.Length; i++) for (int i = 0; i < roleIds.Length; i++)
newRoles[i + 1] = roleIds[i]; newRoles[i + 1] = roleIds[i];
RoleIds = newRoles; RoleIds = newRoles;