From c08f37bb0344bc48159c6cebcd1599b30d12bf7e Mon Sep 17 00:00:00 2001 From: Christopher F Date: Fri, 5 Jan 2018 20:49:59 -0500 Subject: [PATCH] Fix nullref exceptions from Rich Presences --- .../Extensions/EntityExtensions.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs b/src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs index b59702be2..c66163610 100644 --- a/src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs +++ b/src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs @@ -17,9 +17,9 @@ State = model.State.GetValueOrDefault(), SmallAsset = assets?[0], LargeAsset = assets?[1], - Party = model.Party.GetValueOrDefault()?.ToEntity(), - Secrets = model.Secrets.GetValueOrDefault()?.ToEntity(), - Timestamps = model.Timestamps.GetValueOrDefault()?.ToEntity() + Party = model.Party.IsSpecified ? model.Party.Value.ToEntity() : null, + Secrets = model.Secrets.IsSpecified ? model.Secrets.Value.ToEntity() : null, + Timestamps = model.Timestamps.IsSpecified ? model.Timestamps.Value.ToEntity() : null }; } // Stream Game @@ -56,11 +56,9 @@ public static GameParty ToEntity(this API.GameParty model) { - // todo: proper fix for this - if (model == null) return null; // Discord will probably send bad data since they don't validate anything int current = 0, cap = 0; - if (model.Size.Length == 2) + if (model.Size?.Length == 2) { current = model.Size[0]; cap = model.Size[1];