Merge branch 'develop' into stable

1 files changed, 12 insertions, 2 deletions

diff --git a/src/SMAPI/Metadata/CoreAssetPropagator.cs b/src/SMAPI/Metadata/CoreAssetPropagator.cs
index 90629d7f..a44ab7d1 100644
--- a/src/SMAPI/Metadata/CoreAssetPropagator.cs
+++ b/src/SMAPI/Metadata/CoreAssetPropagator.cs
@@ -31,6 +31,9 @@ namespace StardewModdingAPI.Metadata
         /// <summary>Simplifies access to private game code.</summary>
         private readonly Reflector Reflection;
 
+        /// <summary>Encapsulates monitoring and logging.</summary>
+        private readonly IMonitor Monitor;
+
 
         /*********
         ** Public methods
@@ -38,10 +41,12 @@ namespace StardewModdingAPI.Metadata
         /// <summary>Initialise the core asset data.</summary>
         /// <param name="getNormalisedPath">Normalises an asset key to match the cache key.</param>
         /// <param name="reflection">Simplifies access to private code.</param>
-        public CoreAssetPropagator(Func<string, string> getNormalisedPath, Reflector reflection)
+        /// <param name="monitor">Encapsulates monitoring and logging.</param>
+        public CoreAssetPropagator(Func<string, string> getNormalisedPath, Reflector reflection, IMonitor monitor)
         {
             this.GetNormalisedPath = getNormalisedPath;
             this.Reflection = reflection;
+            this.Monitor = monitor;
         }
 
         /// <summary>Reload one of the game's core assets (if applicable).</summary>
@@ -499,7 +504,7 @@ namespace StardewModdingAPI.Metadata
                 if (!character.isVillager() || !dispositions.ContainsKey(character.Name))
                     continue;
 
-                NPC clone = new NPC(null, Vector2.Zero, 0, character.Name);
+                NPC clone = new NPC(null, character.Position, character.DefaultMap, character.FacingDirection, character.Name, null, character.Portrait, eventActor: false);
                 character.Age = clone.Age;
                 character.Manners = clone.Manners;
                 character.SocialAnxiety = clone.SocialAnxiety;
@@ -619,6 +624,11 @@ namespace StardewModdingAPI.Metadata
             {
                 // reload schedule
                 villager.Schedule = villager.getSchedule(Game1.dayOfMonth);
+                if (villager.Schedule == null)
+                {
+                    this.Monitor.Log($"A mod set an invalid schedule for {villager.Name ?? key}, so the NPC may not behave correctly.", LogLevel.Warn);
+                    return true;
+                }
 
                 // switch to new schedule if needed
                 int lastScheduleTime = villager.Schedule.Keys.Where(p => p <= Game1.timeOfDay).OrderByDescending(p => p).FirstOrDefault();