Fix CultLib nullable warnings
This commit is contained in:
parent
e6f448316a
commit
1917bdb025
2 changed files with 5 additions and 4 deletions
|
|
@ -97,7 +97,8 @@ public static class CultDocumentMessagePackSerialization
|
|||
return descriptor.GeneratedPayloadDeserializer(payload);
|
||||
}
|
||||
|
||||
return MessagePackSerializer.Deserialize(type, payload, Options);
|
||||
return MessagePackSerializer.Deserialize(type, payload, Options)
|
||||
?? throw new InvalidOperationException($"MessagePack returned null for Cult document type {type.FullName}.");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -580,14 +580,14 @@ namespace GameCult.Caching
|
|||
members.Add(PersistedMember.FromMember(property, property.PropertyType, value => property.GetValue(value), GetKeyValue(property)));
|
||||
}
|
||||
|
||||
var explicitMembers = members.Where(member => member.ExplicitSlot.HasValue).OrderBy(member => member.ExplicitSlot.Value).ToArray();
|
||||
var explicitMembers = members.Where(member => member.ExplicitSlot.HasValue).OrderBy(member => member.ExplicitSlot.GetValueOrDefault()).ToArray();
|
||||
var implicitMembers = members.Where(member => !member.ExplicitSlot.HasValue).OrderBy(member => member.MetadataToken).ToArray();
|
||||
var assigned = new List<PersistedMember>(members.Count);
|
||||
var nextSlot = explicitMembers.Length == 0 ? 0 : explicitMembers.Max(member => member.ExplicitSlot.Value) + 1;
|
||||
var nextSlot = explicitMembers.Length == 0 ? 0 : explicitMembers.Max(member => member.ExplicitSlot.GetValueOrDefault()) + 1;
|
||||
|
||||
foreach (var member in explicitMembers)
|
||||
{
|
||||
member.Slot = member.ExplicitSlot.Value;
|
||||
member.Slot = member.ExplicitSlot.GetValueOrDefault();
|
||||
assigned.Add(member);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue