fix Context.IsPlayerFree being true before player finishes transitioning to a new location in multiplayer

2 files changed, 2 insertions, 1 deletions

diff --git a/docs/release-notes.md b/docs/release-notes.md
index acbaef99..cb83e7ec 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -42,6 +42,7 @@
   * Fixed `IContentPack.ReadJsonFile` allowing non-relative paths.
   * Fixed trace logs not showing path for invalid mods.
   * Fixed 'no update keys' warning not shown for mods with only invalid update keys.
+  * Fixed `Context.IsPlayerFree` being true before the player finishes transitioning to a new location in multiplayer.
   * Suppressed the game's 'added crickets' debug output.
   * **Breaking change:** `helper.ModRegistry` now returns `IModInfo` instead of `IManifest` directly. This lets SMAPI return more metadata about mods.
   * **Breaking change:** most SMAPI files have been moved into a `smapi-internal` subfolder. This won't affect compiled mod releases, but you'll need to update the build config NuGet package.
diff --git a/src/SMAPI/Context.cs b/src/SMAPI/Context.cs
index 3905699e..c7aed81d 100644
--- a/src/SMAPI/Context.cs
+++ b/src/SMAPI/Context.cs
@@ -17,7 +17,7 @@ namespace StardewModdingAPI
         public static bool IsWorldReady { get; internal set; }
 
         /// <summary>Whether <see cref="IsWorldReady"/> is true and the player is free to act in the world (no menu is displayed, no cutscene is in progress, etc).</summary>
-        public static bool IsPlayerFree => Context.IsWorldReady && Game1.activeClickableMenu == null && !Game1.dialogueUp && (!Game1.eventUp || Game1.isFestival());
+        public static bool IsPlayerFree => Context.IsWorldReady && Game1.currentLocation != null && Game1.activeClickableMenu == null && !Game1.dialogueUp && (!Game1.eventUp || Game1.isFestival());
 
         /// <summary>Whether <see cref="IsPlayerFree"/> is true and the player is free to move (e.g. not using a tool).</summary>
         public static bool CanPlayerMove => Context.IsPlayerFree && Game1.player.CanMove;