ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-21 16:09:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Restore AddonOnRequestedUpdate

Browse source
This commit is contained in:
MidoriKami 2023-09-08 00:16:25 -07:00
parent e54b09a3c5
commit 371b8a9dcc
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Dalamud/Game/AddonLifecycle/AddonLifecycle.cs
View file

@ -31,7 +31,7 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType
private readonly CallHook<AddonDrawDelegate> onAddonDrawHook; private readonly CallHook<AddonDrawDelegate> onAddonDrawHook;
private readonly CallHook<AddonUpdateDelegate> onAddonUpdateHook; private readonly CallHook<AddonUpdateDelegate> onAddonUpdateHook;
private readonly Hook<AddonOnRefreshDelegate> onAddonRefreshHook; 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> newEventListeners = new();
private readonly ConcurrentBag<AddonLifecycleEventListener> removeEventListeners = 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.onAddonDrawHook = new CallHook<AddonDrawDelegate>(this.address.AddonDraw, this.OnAddonDraw);
this.onAddonUpdateHook = new CallHook<AddonUpdateDelegate>(this.address.AddonUpdate, this.OnAddonUpdate); this.onAddonUpdateHook = new CallHook<AddonUpdateDelegate>(this.address.AddonUpdate, this.OnAddonUpdate);
this.onAddonRefreshHook = Hook<AddonOnRefreshDelegate>.FromAddress(this.address.AddonOnRefresh, this.OnAddonRefresh); this.onAddonRefreshHook = Hook<AddonOnRefreshDelegate>.FromAddress(this.address.AddonOnRefresh, this.OnAddonRefresh);
this.onAddonRequestedUpdateHook = new CallHook<AddonOnRequestedUpdateDelegate>(this.address.AddonOnRequestedUpdate, this.OnRequestedUpdate);
// 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);
} }
private delegate nint AddonSetupDelegate(AtkUnitBase* addon); private delegate nint AddonSetupDelegate(AtkUnitBase* addon);
@ -77,7 +75,7 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType
this.onAddonDrawHook.Dispose(); this.onAddonDrawHook.Dispose();
this.onAddonUpdateHook.Dispose(); this.onAddonUpdateHook.Dispose();
this.onAddonRefreshHook.Dispose(); this.onAddonRefreshHook.Dispose();
// this.onAddonRequestedUpdateHook.Dispose(); // See Note in Ctor this.onAddonRequestedUpdateHook.Dispose();
} }
/// <summary> /// <summary>
@ -126,7 +124,7 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType
this.onAddonDrawHook.Enable(); this.onAddonDrawHook.Enable();
this.onAddonUpdateHook.Enable(); this.onAddonUpdateHook.Enable();
this.onAddonRefreshHook.Enable(); this.onAddonRefreshHook.Enable();
// this.onAddonRequestedUpdateHook.Enable(); // See Note in Ctor this.onAddonRequestedUpdateHook.Enable();
} }
private void InvokeListeners(AddonEvent eventType, IAddonLifecycle.AddonArgs args) private void InvokeListeners(AddonEvent eventType, IAddonLifecycle.AddonArgs args)