From 2b2ad7a48621e7f70e92cba72b14e56ebe9becb9 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 22 Apr 2018 21:15:19 -0400
Subject: fix save/load event precedence (#453)

---
 src/SMAPI/Framework/SGame.cs | 73 ++++++++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 36 deletions(-)

(limited to 'src/SMAPI/Framework/SGame.cs')

diff --git a/src/SMAPI/Framework/SGame.cs b/src/SMAPI/Framework/SGame.cs
index 3b9a159f..4f5bd96b 100644
--- a/src/SMAPI/Framework/SGame.cs
+++ b/src/SMAPI/Framework/SGame.cs
@@ -236,42 +236,6 @@ namespace StardewModdingAPI.Framework
                     return;
                 }
 
-                /*********
-                ** Update context
-                *********/
-                if (Context.IsSaveLoaded && !SaveGame.IsProcessing /*still loading save*/ && this.AfterLoadTimer >= 0)
-                {
-                    if (Game1.dayOfMonth != 0) // wait until new-game intro finishes (world not fully initialised yet)
-                        this.AfterLoadTimer--;
-                    Context.IsWorldReady = this.AfterLoadTimer <= 0;
-                }
-
-                /*********
-                ** Update watchers
-                *********/
-                // reset player
-                if (Context.IsWorldReady)
-                {
-                    if (this.CurrentPlayerTracker == null || this.CurrentPlayerTracker.Player != Game1.player)
-                    {
-                        this.CurrentPlayerTracker?.Dispose();
-                        this.CurrentPlayerTracker = new PlayerTracker(Game1.player);
-                    }
-                }
-                else
-                {
-                    if (this.CurrentPlayerTracker != null)
-                    {
-                        this.CurrentPlayerTracker.Dispose();
-                        this.CurrentPlayerTracker = null;
-                    }
-                }
-
-                // update values
-                foreach (IWatcher watcher in this.Watchers)
-                    watcher.Update();
-                this.CurrentPlayerTracker?.Update();
-
                 /*********
                 ** Save events + suppress events during save
                 *********/
@@ -325,6 +289,43 @@ namespace StardewModdingAPI.Framework
                 if (this.FirstUpdate)
                     this.OnGameInitialised();
 
+                
+                /*********
+                ** Update context
+                *********/
+                if (Context.IsSaveLoaded && !SaveGame.IsProcessing /*still loading save*/ && this.AfterLoadTimer >= 0)
+                {
+                    if (Game1.dayOfMonth != 0) // wait until new-game intro finishes (world not fully initialised yet)
+                        this.AfterLoadTimer--;
+                    Context.IsWorldReady = this.AfterLoadTimer <= 0;
+                }
+
+                /*********
+                ** Update watchers
+                *********/
+                // reset player
+                if (Context.IsWorldReady)
+                {
+                    if (this.CurrentPlayerTracker == null || this.CurrentPlayerTracker.Player != Game1.player)
+                    {
+                        this.CurrentPlayerTracker?.Dispose();
+                        this.CurrentPlayerTracker = new PlayerTracker(Game1.player);
+                    }
+                }
+                else
+                {
+                    if (this.CurrentPlayerTracker != null)
+                    {
+                        this.CurrentPlayerTracker.Dispose();
+                        this.CurrentPlayerTracker = null;
+                    }
+                }
+
+                // update values
+                foreach (IWatcher watcher in this.Watchers)
+                    watcher.Update();
+                this.CurrentPlayerTracker?.Update();
+
                 /*********
                 ** Locale changed events
                 *********/
-- 
cgit