- Restore the PlaceAnywhere flag to its original value after applying…

… a layout, instead of setting it to false
jawslouis · Nov 3, 2024 · 129b53b · 129b53b
1 parent 2619bbd
commit 129b53b
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 14 deletions.
diff --git a/MakePlacePlugin/MakePlacePlugin.cs b/MakePlacePlugin/MakePlacePlugin.cs
@@ -46,6 +46,8 @@ public class MakePlacePlugin : IDalamudPlugin
 
         public static bool CurrentlyPlacingItems = false;
 
+        public static bool OriginalPlaceAnywhere = false;
+
         public static bool ApplyChange = false;
 
         public static SaveLayoutManager LayoutManager;
@@ -187,14 +189,6 @@ public unsafe void RecursivelyPlaceItems()
 
             try
             {
-
-                if (Memory.Instance.GetCurrentTerritory() == Memory.HousingArea.Outdoors)
-                {
-                    GetPlotLocation();
-                }
-
-                Memory.Instance.SetPlaceAnywhere(true);
-
                 while (ItemsToPlace.Count > 0)
                 {
                     var item = ItemsToPlace.First();
@@ -215,22 +209,19 @@ public unsafe void RecursivelyPlaceItems()
                     return;
                 }
 
-                if (ItemsToPlace.Count == 0)
-                {
-                    Log("Finished applying layout");
-                }
-
             }
             catch (Exception e)
             {
                 LogError($"Error: {e.Message}", e.StackTrace);
             }
 
             Cleanup();
+
             void Cleanup()
             {
-                Memory.Instance.SetPlaceAnywhere(false);
+                Memory.Instance.SetPlaceAnywhere(OriginalPlaceAnywhere);
                 CurrentlyPlacingItems = false;
+                Log("Finished applying layout");
             }
         }
 
@@ -324,6 +315,14 @@ public void ApplyLayout()
             ItemsToPlace.AddRange(placedLast);
 
 
+            if (Memory.Instance.GetCurrentTerritory() == Memory.HousingArea.Outdoors)
+            {
+                GetPlotLocation();
+            }
+
+            OriginalPlaceAnywhere = Memory.Instance.GetPlaceAnywhere();
+            Memory.Instance.SetPlaceAnywhere(true);
+
             RecursivelyPlaceItems();
         }
 

diff --git a/MakePlacePlugin/Memory.cs b/MakePlacePlugin/Memory.cs
@@ -392,6 +392,32 @@ private static void WriteProtectedBytes(IntPtr addr, byte b)
             WriteProtectedBytes(addr, [b]);
         }
 
+        private static byte ReadProtectedByte(IntPtr addr)
+        {
+            byte value = 0;
+
+            if (addr == IntPtr.Zero) return value;
+
+            VirtualProtect(addr, 1, Protection.PAGE_EXECUTE_READWRITE, out var oldProtection);
+            value = Marshal.ReadByte(addr);
+            VirtualProtect(addr, 1, oldProtection, out _);
+
+            return value;
+        }
+
+        public bool GetPlaceAnywhere()
+        {
+            if (placeAnywhere == IntPtr.Zero)
+            {
+                LogError("Could not setup memory for placing anywhere");
+                return false;
+            }
+
+            var value = ReadProtectedByte(placeAnywhere);
+            return value != 0;
+
+        }
+
         /// <summary>
         /// Sets the flag for place anywhere in memory.
         /// </summary>