ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-18 13:57:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[AddonLifecycle] Fix incorrect delegate signature (#1401)

Browse source
This commit is contained in:
MidoriKami 2023-09-17 21:21:01 -07:00 • committed by GitHub
parent 40a8e607a8
commit 5a3196e5f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -63,7 +63,7 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType
private delegate void AddonOnRequestedUpdateDelegate(AtkUnitBase* addon, NumberArrayData** numberArrayData, StringArrayData** stringArrayData); private delegate void AddonOnRequestedUpdateDelegate(AtkUnitBase* addon, NumberArrayData** numberArrayData, StringArrayData** stringArrayData);
private delegate void AddonOnRefreshDelegate(AtkUnitManager* unitManager, AtkUnitBase* addon, uint valueCount, AtkValue* values); private delegate byte AddonOnRefreshDelegate(AtkUnitManager* unitManager, AtkUnitBase* addon, uint valueCount, AtkValue* values);
/// <inheritdoc/> /// <inheritdoc/>
public void Dispose() public void Dispose()
@ -221,7 +221,7 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType
} }
} }
private void OnAddonRefresh(AtkUnitManager* atkUnitManager, AtkUnitBase* addon, uint valueCount, AtkValue* values) private byte OnAddonRefresh(AtkUnitManager* atkUnitManager, AtkUnitBase* addon, uint valueCount, AtkValue* values)
{ {
try try
{ {
@ -232,7 +232,7 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType
Log.Error(e, "Exception in OnAddonRefresh pre-refresh invoke."); Log.Error(e, "Exception in OnAddonRefresh pre-refresh invoke.");
} }
this.onAddonRefreshHook.Original(atkUnitManager, addon, valueCount, values); var result = this.onAddonRefreshHook.Original(atkUnitManager, addon, valueCount, values);
try try
{ {
@ -242,6 +242,8 @@ internal unsafe class AddonLifecycle : IDisposable, IServiceType
{ {
Log.Error(e, "Exception in OnAddonRefresh post-refresh invoke."); Log.Error(e, "Exception in OnAddonRefresh post-refresh invoke.");
} }
return result;
} }
private void OnRequestedUpdate(AtkUnitBase* addon, NumberArrayData** numberArrayData, StringArrayData** stringArrayData) private void OnRequestedUpdate(AtkUnitBase* addon, NumberArrayData** numberArrayData, StringArrayData** stringArrayData)