summaryrefslogtreecommitdiff
path: root/src/SMAPI.Toolkit
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2021-09-13 00:01:14 -0400
committerJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2021-09-13 00:01:14 -0400
commit4fccaa35709440f98e275f0da3d2b65204b7d6e2 (patch)
treea3e2328af666198485fef17fff8f5f269affe989 /src/SMAPI.Toolkit
parenta9fcbc686d203b20f8e4b127e213b7028b3a9ae1 (diff)
downloadSMAPI-4fccaa35709440f98e275f0da3d2b65204b7d6e2.tar.gz
SMAPI-4fccaa35709440f98e275f0da3d2b65204b7d6e2.tar.bz2
SMAPI-4fccaa35709440f98e275f0da3d2b65204b7d6e2.zip
add nullable support in JSON converters
Diffstat (limited to 'src/SMAPI.Toolkit')
-rw-r--r--src/SMAPI.Toolkit/Serialization/Converters/SimpleReadOnlyConverter.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/SMAPI.Toolkit/Serialization/Converters/SimpleReadOnlyConverter.cs b/src/SMAPI.Toolkit/Serialization/Converters/SimpleReadOnlyConverter.cs
index 549f0c18..ccc5158b 100644
--- a/src/SMAPI.Toolkit/Serialization/Converters/SimpleReadOnlyConverter.cs
+++ b/src/SMAPI.Toolkit/Serialization/Converters/SimpleReadOnlyConverter.cs
@@ -22,7 +22,7 @@ namespace StardewModdingAPI.Toolkit.Serialization.Converters
/// <param name="objectType">The object type.</param>
public override bool CanConvert(Type objectType)
{
- return objectType == typeof(T);
+ return objectType == typeof(T) || Nullable.GetUnderlyingType(objectType) == typeof(T);
}
/// <summary>Writes the JSON representation of the object.</summary>
@@ -44,10 +44,15 @@ namespace StardewModdingAPI.Toolkit.Serialization.Converters
string path = reader.Path;
switch (reader.TokenType)
{
+ case JsonToken.Null when Nullable.GetUnderlyingType(objectType) != null:
+ return null;
+
case JsonToken.StartObject:
return this.ReadObject(JObject.Load(reader), path);
+
case JsonToken.String:
return this.ReadString(JToken.Load(reader).Value<string>(), path);
+
default:
throw new SParseException($"Can't parse {typeof(T).Name} from {reader.TokenType} node (path: {reader.Path}).");
}