summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <github@jplamondonw.com>2017-09-24 02:25:35 -0400
committerJesse Plamondon-Willard <github@jplamondonw.com>2017-09-24 02:25:35 -0400
commit8e0d1b8682f0898e941fee16c6649f1165fde499 (patch)
tree1c1af4e5ccd7fab032a2173a11e82a745ea85b34
parent5f85d89974c3f1974f8e3d372f12b1cac743cd3a (diff)
downloadSMAPI-8e0d1b8682f0898e941fee16c6649f1165fde499.tar.gz
SMAPI-8e0d1b8682f0898e941fee16c6649f1165fde499.tar.bz2
SMAPI-8e0d1b8682f0898e941fee16c6649f1165fde499.zip
minor bug fixes (#361)
-rw-r--r--src/StardewModdingAPI/Framework/Serialisation/SFieldConverter.cs2
-rw-r--r--src/StardewModdingAPI/Program.cs2
-rw-r--r--src/StardewModdingAPI/StardewModdingAPI.config.json2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/StardewModdingAPI/Framework/Serialisation/SFieldConverter.cs b/src/StardewModdingAPI/Framework/Serialisation/SFieldConverter.cs
index ffece081..917c950d 100644
--- a/src/StardewModdingAPI/Framework/Serialisation/SFieldConverter.cs
+++ b/src/StardewModdingAPI/Framework/Serialisation/SFieldConverter.cs
@@ -97,7 +97,7 @@ namespace StardewModdingAPI.Framework.Serialisation
foreach (JProperty property in JObject.Load(reader).Properties())
{
string range = property.Name;
- ModStatus status = property.Value.Value<ModStatus>(nameof(ModCompatibility.Status));
+ ModStatus status = (ModStatus)Enum.Parse(typeof(ModStatus), property.Value.Value<string>(nameof(ModCompatibility.Status)));
string reasonPhrase = property.Value.Value<string>(nameof(ModCompatibility.ReasonPhrase));
result.Add(new ModCompatibility(range, status, reasonPhrase));
diff --git a/src/StardewModdingAPI/Program.cs b/src/StardewModdingAPI/Program.cs
index f821b559..fcfa1efc 100644
--- a/src/StardewModdingAPI/Program.cs
+++ b/src/StardewModdingAPI/Program.cs
@@ -642,7 +642,7 @@ namespace StardewModdingAPI
Assembly modAssembly;
try
{
- modAssembly = modAssemblyLoader.Load(metadata, assemblyPath, assumeCompatible: metadata.DataRecord.GetCompatibility(metadata.Manifest.Version)?.Status == ModStatus.AssumeCompatible);
+ modAssembly = modAssemblyLoader.Load(metadata, assemblyPath, assumeCompatible: metadata.DataRecord?.GetCompatibility(metadata.Manifest.Version)?.Status == ModStatus.AssumeCompatible);
}
catch (IncompatibleInstructionException ex)
{
diff --git a/src/StardewModdingAPI/StardewModdingAPI.config.json b/src/StardewModdingAPI/StardewModdingAPI.config.json
index 3844b8b0..75b884f5 100644
--- a/src/StardewModdingAPI/StardewModdingAPI.config.json
+++ b/src/StardewModdingAPI/StardewModdingAPI.config.json
@@ -58,7 +58,7 @@ This file contains advanced configuration for SMAPI. You generally shouldn't cha
"ID": "1e36d4ca-c7ef-4dfb-9927-d27a6c3c8bdc",
"UpdateUrls": [ "http://community.playstarbound.com/resources/3532", "http://stardewvalleywiki.com/Modding:SMAPI_2.0" ],
"Compatibility": {
- "~0.01": { "Status": "AssumeBroken" } // broke in SMAPI 1.9
+ "~0.1": { "Status": "AssumeBroken" } // broke in SMAPI 1.9
}
},
{