From f06b4dd6102e64f929a218192002c1d2ba05ebed Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 16 Sep 2020 17:35:25 -0400
Subject: fix conflict with PyTK's map display device

---
 src/SMAPI/Framework/SCore.cs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs
index c9477c52..e64c2801 100644
--- a/src/SMAPI/Framework/SCore.cs
+++ b/src/SMAPI/Framework/SCore.cs
@@ -43,6 +43,7 @@ using StardewModdingAPI.Toolkit.Serialization;
 using StardewModdingAPI.Toolkit.Utilities;
 using StardewModdingAPI.Utilities;
 using StardewValley;
+using xTile.Display;
 using SObject = StardewValley.Object;
 
 namespace StardewModdingAPI.Framework
@@ -472,8 +473,13 @@ namespace StardewModdingAPI.Framework
                 SCore.PerformanceMonitor.PrintQueuedAlerts();
 
                 // reapply overrides
-                if (this.JustReturnedToTitle && !(Game1.mapDisplayDevice is SDisplayDevice))
-                    Game1.mapDisplayDevice = new SDisplayDevice(Game1.content, Game1.game1.GraphicsDevice);
+                if (this.JustReturnedToTitle)
+                {
+                    if (!(Game1.mapDisplayDevice is SDisplayDevice))
+                        Game1.mapDisplayDevice = this.GetMapDisplayDevice();
+
+                    this.JustReturnedToTitle = false;
+                }
 
                 /*********
                 ** First-tick initialization
@@ -1738,6 +1744,13 @@ namespace StardewModdingAPI.Framework
             return translations;
         }
 
+        /// <summary>Get the map display device which applies SMAPI features like tile rotation to loaded maps.</summary>
+        /// <remarks>This is separate to let mods like PyTK wrap it with their own functionality.</remarks>
+        private IDisplayDevice GetMapDisplayDevice()
+        {
+            return new SDisplayDevice(Game1.content, Game1.game1.GraphicsDevice);
+        }
+
         /// <summary>Get the absolute path to the next available log file.</summary>
         private string GetLogPath()
         {
-- 
cgit