summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <github@jplamondonw.com>2018-04-29 12:51:15 -0400
committerJesse Plamondon-Willard <github@jplamondonw.com>2018-04-29 12:51:15 -0400
commit89e2b76a5aa545331c6e8dd708015e2dc6e5dfe6 (patch)
tree199aff31a5db994edc6297d107d1d4ee6dc2e022 /src
parent46fe7a86a7020d9170ab5a05047a3f7a6cc4b3c0 (diff)
downloadSMAPI-89e2b76a5aa545331c6e8dd708015e2dc6e5dfe6.tar.gz
SMAPI-89e2b76a5aa545331c6e8dd708015e2dc6e5dfe6.tar.bz2
SMAPI-89e2b76a5aa545331c6e8dd708015e2dc6e5dfe6.zip
fix multiplayer error after player joins but before location is loaded
Diffstat (limited to 'src')
-rw-r--r--src/SMAPI/Framework/SGame.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/SMAPI/Framework/SGame.cs b/src/SMAPI/Framework/SGame.cs
index b206879c..a580d3eb 100644
--- a/src/SMAPI/Framework/SGame.cs
+++ b/src/SMAPI/Framework/SGame.cs
@@ -293,7 +293,7 @@ namespace StardewModdingAPI.Framework
/*********
** Update context
*********/
- if (Context.IsSaveLoaded && !SaveGame.IsProcessing /*still loading save*/ && this.AfterLoadTimer >= 0)
+ if (Context.IsSaveLoaded && !SaveGame.IsProcessing /*still loading save*/ && this.AfterLoadTimer >= 0 && Game1.currentLocation != null)
{
if (Game1.dayOfMonth != 0) // wait until new-game intro finishes (world not fully initialised yet)
this.AfterLoadTimer--;