From 6c7389c831bbab40d6a08cda61106f9a463e0f9d Mon Sep 17 00:00:00 2001
From: Liza Carvelli <lizacarvelli@gmail.com>
Date: Thu, 27 Oct 2022 00:25:09 +0200
Subject: [PATCH] Change pomander logic

---
 Pal.Client/Pal.Client.csproj |  2 +-
 Pal.Client/Plugin.cs         | 41 ++++++++++++++----------------------
 2 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/Pal.Client/Pal.Client.csproj b/Pal.Client/Pal.Client.csproj
index 63070a4..03292e7 100644
--- a/Pal.Client/Pal.Client.csproj
+++ b/Pal.Client/Pal.Client.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFramework>net6.0-windows</TargetFramework>
 		<LangVersion>9.0</LangVersion>
-		<Version>1.6.0.0</Version>
+		<Version>1.7.0.0</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>
diff --git a/Pal.Client/Plugin.cs b/Pal.Client/Plugin.cs
index e9687d7..fe3e539 100644
--- a/Pal.Client/Plugin.cs
+++ b/Pal.Client/Plugin.cs
@@ -4,9 +4,7 @@ using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Game.Command;
 using Dalamud.Game.Text;
 using Dalamud.Game.Text.SeStringHandling;
-using Dalamud.Interface.Colors;
 using Dalamud.Interface.Windowing;
-using Dalamud.Logging;
 using Dalamud.Plugin;
 using ECommons;
 using ECommons.Schedulers;
@@ -41,7 +39,6 @@ namespace Pal.Client
             { Marker.EType.SilverCoffer, new MarkerConfig { Radius = 1f } },
         };
         private bool _configUpdated = false;
-        private bool _pomandersUpdated = false;
         private LocalizedChatMessages _localizedChatMessages = new();
 
         internal ConcurrentDictionary<ushort, ConcurrentBag<Marker>> FloorMarkers { get; } = new();
@@ -190,8 +187,6 @@ namespace Pal.Client
             }
             else
                 return;
-
-            _pomandersUpdated = true;
         }
 
         private void OnFrameworkUpdate(Framework framework)
@@ -286,33 +281,29 @@ namespace Pal.Client
                 saveMarkers = true;
             }
 
-            if (_pomandersUpdated)
+            if (!recreateLayout && currentFloorMarkers.Count > 0 && (config.OnlyVisibleTrapsAfterPomander || config.OnlyVisibleHoardAfterPomander))
             {
-                if (currentFloorMarkers.Count > 0 && (config.OnlyVisibleTrapsAfterPomander || config.OnlyVisibleHoardAfterPomander))
+
+                try
                 {
-
-                    try
+                    foreach (var marker in currentFloorMarkers)
                     {
-                        foreach (var marker in currentFloorMarkers)
+                        uint desiredColor = DetermineColor(marker, visibleMarkers);
+                        if (marker.SplatoonElement == null || !marker.SplatoonElement.IsValid())
                         {
-                            uint desiredColor = DetermineColor(marker, visibleMarkers);
-                            if (marker.SplatoonElement == null || !marker.SplatoonElement.IsValid())
-                            {
-                                recreateLayout = true;
-                                break;
-                            }
-
-                            if (marker.SplatoonElement.color != desiredColor)
-                                marker.SplatoonElement.color = desiredColor;
+                            recreateLayout = true;
+                            break;
                         }
-                    }
-                    catch (Exception e)
-                    {
-                        DebugMessage = $"{DateTime.Now}\n{e}";
-                        recreateLayout = true;
+
+                        if (marker.SplatoonElement.color != desiredColor)
+                            marker.SplatoonElement.color = desiredColor;
                     }
                 }
-                _pomandersUpdated = false;
+                catch (Exception e)
+                {
+                    DebugMessage = $"{DateTime.Now}\n{e}";
+                    recreateLayout = true;
+                }
             }
 
             if (saveMarkers)