From c619bb2c4b03d6ea551a1a5480c1965f75f356a7 Mon Sep 17 00:00:00 2001 From: Armano den Boef Date: Thu, 3 Feb 2022 13:35:52 +0100 Subject: [PATCH] Patch, non-assigned --- src/Discord.Net.WebSocket/DiscordSocketClient.cs | 2 +- src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs | 4 ++-- src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Discord.Net.WebSocket/DiscordSocketClient.cs b/src/Discord.Net.WebSocket/DiscordSocketClient.cs index 7f992d930..c5f2bb6af 100644 --- a/src/Discord.Net.WebSocket/DiscordSocketClient.cs +++ b/src/Discord.Net.WebSocket/DiscordSocketClient.cs @@ -1293,7 +1293,7 @@ namespace Discord.WebSocket if (user.GlobalUser.Update(State, data.User)) { //Global data was updated, trigger UserUpdated - await TimedInvokeAsync(_userUpdatedEvent, nameof(UserUpdated), beforeGlobal, user).ConfigureAwait(false); + await TimedInvokeAsync(_userUpdatedEvent, nameof(UserUpdated), before.GlobalUser, user).ConfigureAwait(false); } user.Update(State, data); diff --git a/src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs b/src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs index 8d6d6488e..8c2825bc4 100644 --- a/src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs +++ b/src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs @@ -24,7 +24,7 @@ namespace Discord.WebSocket private long? _joinedAtTicks; private ImmutableArray _roleIds; - internal override SocketGlobalUser GlobalUser { get; } + internal override SocketGlobalUser GlobalUser { get; set; } /// /// Gets the guild the user is in. /// @@ -252,7 +252,7 @@ namespace Discord.WebSocket internal new SocketGuildUser Clone() { var clone = MemberwiseClone() as SocketGuildUser; - clone.GlobalUser.Clone(); + clone.GlobalUser = GlobalUser.Clone(); return clone; } #endregion diff --git a/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs b/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs index b14993991..35121d666 100644 --- a/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs +++ b/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs @@ -29,7 +29,7 @@ namespace Discord.WebSocket public abstract bool IsWebhook { get; } /// public UserProperties? PublicFlags { get; private set; } - internal abstract SocketGlobalUser GlobalUser { get; } + internal abstract SocketGlobalUser GlobalUser { get; set; } internal abstract SocketPresence Presence { get; set; } ///