From 371b8a9dccb6324114c763d83f11e70ea60fb1df Mon Sep 17 00:00:00 2001
From: MidoriKami <9083275+MidoriKami@users.noreply.github.com>
Date: Fri, 8 Sep 2023 00:16:25 -0700
Subject: [PATCH] Restore AddonOnRequestedUpdate

---
 Dalamud/Game/AddonLifecycle/AddonLifecycle.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Dalamud/Game/AddonLifecycle/AddonLifecycle.cs b/Dalamud/Game/AddonLifecycle/AddonLifecycle.cs
index d6da18dd5..321c60a15 100644
--- a/Dalamud/Game/AddonLifecycle/AddonLifecycle.cs
+++ b/Dalamud/Game/AddonLifecycle/AddonLifecycle.cs
@@ -31,7 +31,7 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType
     private readonly CallHook<AddonDrawDelegate> onAddonDrawHook;
     private readonly CallHook<AddonUpdateDelegate> onAddonUpdateHook;
     private readonly Hook<AddonOnRefreshDelegate> onAddonRefreshHook;
-    // private readonly CallHook<AddonOnRequestedUpdate> onAddonRequestedUpdateHook; // See Note in Ctor
+    private readonly CallHook<AddonOnRequestedUpdateDelegate> onAddonRequestedUpdateHook;
 
     private readonly ConcurrentBag<AddonLifecycleEventListener> newEventListeners = new();
     private readonly ConcurrentBag<AddonLifecycleEventListener> removeEventListeners = new();
@@ -50,9 +50,7 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType
         this.onAddonDrawHook = new CallHook<AddonDrawDelegate>(this.address.AddonDraw, this.OnAddonDraw);
         this.onAddonUpdateHook = new CallHook<AddonUpdateDelegate>(this.address.AddonUpdate, this.OnAddonUpdate);
         this.onAddonRefreshHook = Hook<AddonOnRefreshDelegate>.FromAddress(this.address.AddonOnRefresh, this.OnAddonRefresh);
-        
-        // todo: reenable this. WARNING: This hook overwrites a system that SimpleTweaks uses, causing SimpleTweaks to report exceptions.
-        // this.onAddonRequestedUpdateHook = new CallHook<AddonOnRequestedUpdate>(this.address.AddonOnRequestedUpdate, this.OnRequestedUpdate);
+        this.onAddonRequestedUpdateHook = new CallHook<AddonOnRequestedUpdateDelegate>(this.address.AddonOnRequestedUpdate, this.OnRequestedUpdate);
     }
 
     private delegate nint AddonSetupDelegate(AtkUnitBase* addon);
@@ -77,7 +75,7 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType
         this.onAddonDrawHook.Dispose();
         this.onAddonUpdateHook.Dispose();
         this.onAddonRefreshHook.Dispose();
-        // this.onAddonRequestedUpdateHook.Dispose(); // See Note in Ctor
+        this.onAddonRequestedUpdateHook.Dispose();
     }
     
     /// <summary>
@@ -126,7 +124,7 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType
         this.onAddonDrawHook.Enable();
         this.onAddonUpdateHook.Enable();
         this.onAddonRefreshHook.Enable();
-        // this.onAddonRequestedUpdateHook.Enable(); // See Note in Ctor
+        this.onAddonRequestedUpdateHook.Enable();
     }
     
     private void InvokeListeners(AddonEvent eventType, IAddonLifecycle.AddonArgs args)