Merge pull request #464 from Sentinent/dev

Fixed guild member's joinedat reseting after certain events
2017-01-25 17:16:42 -04:00
parent 0d433caaa6 a03269fcf1
commit a75af58bdb
3 changed files with 5 additions and 3 deletions
--- a/src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs
+++ b/src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs
@@ -79,7 +79,8 @@ namespace Discord.WebSocket
        internal void Update(ClientState state, Model model)
        {
            base.Update(state, model.User);
-            _joinedAtTicks = model.JoinedAt.UtcTicks;
+            if (model.JoinedAt.IsSpecified)
+                _joinedAtTicks = model.JoinedAt.Value.UtcTicks;
            if (model.Nick.IsSpecified)
                Nickname = model.Nick.Value;
            UpdateRoles(model.Roles);