From 27a7adfdb9851173835fb09ec2af0141d4a329e5 Mon Sep 17 00:00:00 2001
From: MidoriKami <mi_kami@outlook.com>
Date: Tue, 25 Nov 2025 18:56:34 -0800
Subject: [PATCH] Minor cleanup

---
 Dalamud/Game/Addon/Lifecycle/AddonArgsType.cs         |  2 +-
 Dalamud/Game/Addon/Lifecycle/AddonLifecycle.cs        | 11 ++++++-----
 .../Addon/Lifecycle/AddonLifecycleAddressResolver.cs  |  2 +-
 Dalamud/Game/Addon/Lifecycle/AddonVirtualTable.cs     |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Dalamud/Game/Addon/Lifecycle/AddonArgsType.cs b/Dalamud/Game/Addon/Lifecycle/AddonArgsType.cs
index 95dc5f718..de32bd254 100644
--- a/Dalamud/Game/Addon/Lifecycle/AddonArgsType.cs
+++ b/Dalamud/Game/Addon/Lifecycle/AddonArgsType.cs
@@ -41,7 +41,7 @@ public enum AddonArgsType
     ReceiveEvent,
 
     /// <summary>
-    /// Generic arg type that contains no meaningful data
+    /// Generic arg type that contains no meaningful data.
     /// </summary>
     Generic,
 }
diff --git a/Dalamud/Game/Addon/Lifecycle/AddonLifecycle.cs b/Dalamud/Game/Addon/Lifecycle/AddonLifecycle.cs
index cea30d6be..0c23f5661 100644
--- a/Dalamud/Game/Addon/Lifecycle/AddonLifecycle.cs
+++ b/Dalamud/Game/Addon/Lifecycle/AddonLifecycle.cs
@@ -33,8 +33,6 @@ internal unsafe class AddonLifecycle : IInternalDisposableService
     {
         this.onInitializeAddonHook = Hook<AtkUnitBase.Delegates.Initialize>.FromAddress((nint)AtkUnitBase.StaticVirtualTablePointer->Initialize, this.OnAddonInitialize);
         this.onInitializeAddonHook.Enable();
-
-        Log.Warning($"FOUND INITIALIZE HOOK AT {this.onInitializeAddonHook.Address:X}");
     }
 
     /// <summary>
@@ -48,10 +46,13 @@ internal unsafe class AddonLifecycle : IInternalDisposableService
         this.onInitializeAddonHook?.Dispose();
         this.onInitializeAddonHook = null;
 
-        foreach (var virtualTable in this.modifiedTables.Values)
+        this.framework.RunOnFrameworkThread(() =>
         {
-            virtualTable.Dispose();
-        }
+            foreach (var virtualTable in this.modifiedTables.Values)
+            {
+                virtualTable.Dispose();
+            }
+        });
     }
 
     /// <summary>
diff --git a/Dalamud/Game/Addon/Lifecycle/AddonLifecycleAddressResolver.cs b/Dalamud/Game/Addon/Lifecycle/AddonLifecycleAddressResolver.cs
index 1d767aac4..9359870a5 100644
--- a/Dalamud/Game/Addon/Lifecycle/AddonLifecycleAddressResolver.cs
+++ b/Dalamud/Game/Addon/Lifecycle/AddonLifecycleAddressResolver.cs
@@ -5,7 +5,7 @@ namespace Dalamud.Game.Addon.Lifecycle;
 /// <summary>
 /// AddonLifecycleService memory address resolver.
 /// </summary>
-[Api13ToDo("Remove this class entirely, its not used by AddonLifecycleAnymore, and use something else for HookWidget")]
+[Api13ToDo("Remove this class entirely, its not used by AddonLifecycle anymore, also need to use something else for HookWidget")]
 internal class AddonLifecycleAddressResolver : BaseAddressResolver
 {
     /// <summary>
diff --git a/Dalamud/Game/Addon/Lifecycle/AddonVirtualTable.cs b/Dalamud/Game/Addon/Lifecycle/AddonVirtualTable.cs
index 58e32a252..ca5d970ef 100644
--- a/Dalamud/Game/Addon/Lifecycle/AddonVirtualTable.cs
+++ b/Dalamud/Game/Addon/Lifecycle/AddonVirtualTable.cs
@@ -19,7 +19,7 @@ internal unsafe class AddonVirtualTable : IDisposable
     // Copying extra entries is not problematic, and is considered safe.
     private const int VirtualTableEntryCount = 200;
 
-    private const bool EnableAdvancedLogging = true;
+    private const bool EnableAdvancedLogging = false;
     private const bool EnableSpammyLogging = false;
 
     private static readonly ModuleLog Log = new("LifecycleVT");