ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-25 22:21:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

More style fixes

Browse source
This commit is contained in:
MidoriKami 2026-01-14 15:37:17 -08:00
parent 15ef9e7872
commit 53aa031f90
2 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -64,7 +64,10 @@ internal unsafe class AddonLifecycle : IInternalDisposableService
internal static AtkUnitBase.AtkUnitBaseVirtualTable* GetOriginalVirtualTable(AtkUnitBase.AtkUnitBaseVirtualTable* tableAddress) internal static AtkUnitBase.AtkUnitBaseVirtualTable* GetOriginalVirtualTable(AtkUnitBase.AtkUnitBaseVirtualTable* tableAddress)
{ {
var matchedTable = AllocatedTables.FirstOrDefault(table => table.ModifiedVirtualTable == tableAddress); var matchedTable = AllocatedTables.FirstOrDefault(table => table.ModifiedVirtualTable == tableAddress);
if (matchedTable == null) return null; if (matchedTable == null)
{
return null;
}
return matchedTable.OriginalVirtualTable; return matchedTable.OriginalVirtualTable;
} }
@ -153,13 +156,19 @@ internal unsafe class AddonLifecycle : IInternalDisposableService
{ {
if (!this.EventListeners.ContainsKey(listener.EventType)) if (!this.EventListeners.ContainsKey(listener.EventType))
{ {
if (!this.EventListeners.TryAdd(listener.EventType, [])) return; if (!this.EventListeners.TryAdd(listener.EventType, []))
{
return;
}
} }
// Note: string.Empty is a valid addon name, as that will trigger on any addon for this event type // Note: string.Empty is a valid addon name, as that will trigger on any addon for this event type
if (!this.EventListeners[listener.EventType].ContainsKey(listener.AddonName)) if (!this.EventListeners[listener.EventType].ContainsKey(listener.AddonName))
{ {
if (!this.EventListeners[listener.EventType].TryAdd(listener.AddonName, [])) return; if (!this.EventListeners[listener.EventType].TryAdd(listener.AddonName, []))
{
return;
}
} }
this.EventListeners[listener.EventType][listener.AddonName].Add(listener); this.EventListeners[listener.EventType][listener.AddonName].Add(listener);

9
Dalamud/Game/Agent/AgentLifecycle.cs
View file

@ -77,7 +77,10 @@ internal unsafe class AgentLifecycle : IInternalDisposableService
internal static AgentInterface.AgentInterfaceVirtualTable* GetOriginalVirtualTable(AgentInterface.AgentInterfaceVirtualTable* tableAddress) internal static AgentInterface.AgentInterfaceVirtualTable* GetOriginalVirtualTable(AgentInterface.AgentInterfaceVirtualTable* tableAddress)
{ {
var matchedTable = AllocatedTables.FirstOrDefault(table => table.ModifiedVirtualTable == tableAddress); var matchedTable = AllocatedTables.FirstOrDefault(table => table.ModifiedVirtualTable == tableAddress);
if (matchedTable == null) return null; if (matchedTable == null)
{
return null;
}
return matchedTable.OriginalVirtualTable; return matchedTable.OriginalVirtualTable;
} }
@ -185,15 +188,19 @@ internal unsafe class AgentLifecycle : IInternalDisposableService
if (!this.EventListeners.ContainsKey(listener.EventType)) if (!this.EventListeners.ContainsKey(listener.EventType))
{ {
if (!this.EventListeners.TryAdd(listener.EventType, [])) if (!this.EventListeners.TryAdd(listener.EventType, []))
{
return; return;
} }
}
// Note: uint.MaxValue is a valid agent id, as that will trigger on any agent for this event type // Note: uint.MaxValue is a valid agent id, as that will trigger on any agent for this event type
if (!this.EventListeners[listener.EventType].ContainsKey(listener.AgentId)) if (!this.EventListeners[listener.EventType].ContainsKey(listener.AgentId))
{ {
if (!this.EventListeners[listener.EventType].TryAdd(listener.AgentId, [])) if (!this.EventListeners[listener.EventType].TryAdd(listener.AgentId, []))
{
return; return;
} }
}
this.EventListeners[listener.EventType][listener.AgentId].Add(listener); this.EventListeners[listener.EventType][listener.AgentId].Add(listener);
} }