ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-17 21:37:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Force to next tick instead of running immediately

Browse source
This commit is contained in:
MidoriKami 2026-01-04 14:41:30 -08:00
parent 1398054216
commit 36c3429566
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Dalamud/Game/Addon/Lifecycle/AddonLifecycle.cs
View file

@ -31,6 +31,7 @@ internal unsafe class AddonLifecycle : IInternalDisposableService
private readonly Framework framework = Service<Framework>.Get(); private readonly Framework framework = Service<Framework>.Get();
private Hook<AtkUnitBase.Delegates.Initialize>? onInitializeAddonHook; private Hook<AtkUnitBase.Delegates.Initialize>? onInitializeAddonHook;
private bool isInvokingListeners = false;
[ServiceManager.ServiceConstructor] [ServiceManager.ServiceConstructor]
private AddonLifecycle() private AddonLifecycle()
@ -61,7 +62,7 @@ internal unsafe class AddonLifecycle : IInternalDisposableService
/// <param name="listener">The listener to register.</param> /// <param name="listener">The listener to register.</param>
internal void RegisterListener(AddonLifecycleEventListener listener) internal void RegisterListener(AddonLifecycleEventListener listener)
{ {
this.framework.RunOnFrameworkThread(() => this.framework.RunOnTick(() =>
{ {
if (!this.EventListeners.ContainsKey(listener.EventType)) if (!this.EventListeners.ContainsKey(listener.EventType))
{ {
@ -77,7 +78,7 @@ internal unsafe class AddonLifecycle : IInternalDisposableService
} }
this.EventListeners[listener.EventType][listener.AddonName].Add(listener); this.EventListeners[listener.EventType][listener.AddonName].Add(listener);
}); }, delayTicks: this.isInvokingListeners ? 1 : 0);
} }
/// <summary> /// <summary>
@ -86,7 +87,7 @@ internal unsafe class AddonLifecycle : IInternalDisposableService
/// <param name="listener">The listener to unregister.</param> /// <param name="listener">The listener to unregister.</param>
internal void UnregisterListener(AddonLifecycleEventListener listener) internal void UnregisterListener(AddonLifecycleEventListener listener)
{ {
this.framework.RunOnFrameworkThread(() => this.framework.RunOnTick(() =>
{ {
if (this.EventListeners.TryGetValue(listener.EventType, out var addonListeners)) if (this.EventListeners.TryGetValue(listener.EventType, out var addonListeners))
{ {
@ -95,7 +96,7 @@ internal unsafe class AddonLifecycle : IInternalDisposableService
addonListener.Remove(listener); addonListener.Remove(listener);
} }
} }
}); }, delayTicks: this.isInvokingListeners ? 1 : 0);
} }
/// <summary> /// <summary>
@ -106,6 +107,8 @@ internal unsafe class AddonLifecycle : IInternalDisposableService
/// <param name="blame">What to blame on errors.</param> /// <param name="blame">What to blame on errors.</param>
internal void InvokeListenersSafely(AddonEvent eventType, AddonArgs args, [CallerMemberName] string blame = "") internal void InvokeListenersSafely(AddonEvent eventType, AddonArgs args, [CallerMemberName] string blame = "")
{ {
this.isInvokingListeners = true;
// Early return if we don't have any listeners of this type // Early return if we don't have any listeners of this type
if (!this.EventListeners.TryGetValue(eventType, out var addonListeners)) return; if (!this.EventListeners.TryGetValue(eventType, out var addonListeners)) return;
@ -140,6 +143,8 @@ internal unsafe class AddonLifecycle : IInternalDisposableService
} }
} }
} }
this.isInvokingListeners = false;
} }
/// <summary> /// <summary>