From 0c3af33d5dae700fa33ac39e86a76a4b625bb3c6 Mon Sep 17 00:00:00 2001
From: defnotken <itsdefnotken@gmail.com>
Date: Mon, 15 Sep 2025 18:42:34 -0500
Subject: [PATCH] oops forgot to push

---
 LightlessSync/PlayerData/Handlers/PairHandler.cs     | 12 ++++++++++--
 .../Services/CharaData/CharaDataNearbyManager.cs     |  4 ++--
 LightlessSync/Services/DalamudUtilService.cs         |  4 ++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/LightlessSync/PlayerData/Handlers/PairHandler.cs b/LightlessSync/PlayerData/Handlers/PairHandler.cs
index 5947f80..24cd87f 100644
--- a/LightlessSync/PlayerData/Handlers/PairHandler.cs
+++ b/LightlessSync/PlayerData/Handlers/PairHandler.cs
@@ -88,11 +88,19 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
                 _redrawOnNextApplication = true;
             }
         });
-        Mediator.Subscribe<CombatOrPerformanceEndMessage>(this, (msg) =>
+        Mediator.Subscribe<CombatEndMessage>(this, (msg) =>
         {
             EnableSync();
         });
-        Mediator.Subscribe<CombatOrPerformanceStartMessage>(this, _ =>
+        Mediator.Subscribe<CombatStartMessage>(this, _ =>
+        {
+            DisableSync();
+        });
+        Mediator.Subscribe<PerformanceEndMessage>(this, (msg) =>
+        {
+            EnableSync();
+        });
+        Mediator.Subscribe<PerformanceStartMessage>(this, _ =>
         {
             DisableSync();
         });
diff --git a/LightlessSync/Services/CharaData/CharaDataNearbyManager.cs b/LightlessSync/Services/CharaData/CharaDataNearbyManager.cs
index 8b86e8e..b3d4800 100644
--- a/LightlessSync/Services/CharaData/CharaDataNearbyManager.cs
+++ b/LightlessSync/Services/CharaData/CharaDataNearbyManager.cs
@@ -236,7 +236,7 @@ public sealed class CharaDataNearbyManager : DisposableMediatorSubscriberBase
             }
         }
 
-        if (_charaDataConfigService.Current.NearbyDrawWisps && !_dalamudUtilService.IsInGpose && !_dalamudUtilService.IsInCombatOrPerforming)
+        if (_charaDataConfigService.Current.NearbyDrawWisps && !_dalamudUtilService.IsInGpose && !_dalamudUtilService.IsInCombat && !_dalamudUtilService.IsPerforming && !_dalamudUtilService.IsInInstance)
             await _dalamudUtilService.RunOnFrameworkThread(() => ManageWispsNearby(previousPoses)).ConfigureAwait(false);
     }
 
@@ -253,7 +253,7 @@ public sealed class CharaDataNearbyManager : DisposableMediatorSubscriberBase
             return;
         }
 
-        if (!_charaDataConfigService.Current.NearbyDrawWisps || _dalamudUtilService.IsInGpose || _dalamudUtilService.IsInCombatOrPerforming)
+        if (!_charaDataConfigService.Current.NearbyDrawWisps || _dalamudUtilService.IsInGpose || _dalamudUtilService.IsInCombat || _dalamudUtilService.IsPerforming || _dalamudUtilService.IsInInstance)
             ClearAllVfx();
 
         var camera = CameraManager.Instance()->CurrentCamera;
diff --git a/LightlessSync/Services/DalamudUtilService.cs b/LightlessSync/Services/DalamudUtilService.cs
index 88b0ee1..ea21af7 100644
--- a/LightlessSync/Services/DalamudUtilService.cs
+++ b/LightlessSync/Services/DalamudUtilService.cs
@@ -767,7 +767,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                 _classJobId = localPlayer.ClassJob.RowId;
             }
 
-            if (!IsInCombatOrPerforming)
+            if (!IsInCombat || !IsPerforming || !IsInInstance)
                 Mediator.Publish(new FrameworkUpdateMessage());
 
             Mediator.Publish(new PriorityFrameworkUpdateMessage());
@@ -796,7 +796,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                 IsLodEnabled = lodEnabled;
             }
 
-            if (IsInCombatOrPerforming)
+            if (IsInCombat || IsPerforming || IsInInstance)
                 Mediator.Publish(new FrameworkUpdateMessage());
 
             Mediator.Publish(new DelayedFrameworkUpdateMessage());