From 53aa031f90df8ad00cc501fcb7cbbb1c19127393 Mon Sep 17 00:00:00 2001 From: MidoriKami Date: Wed, 14 Jan 2026 15:37:17 -0800 Subject: [PATCH] More style fixes --- Dalamud/Game/Addon/Lifecycle/AddonLifecycle.cs | 15 ++++++++++++--- Dalamud/Game/Agent/AgentLifecycle.cs | 9 ++++++++- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Dalamud/Game/Addon/Lifecycle/AddonLifecycle.cs b/Dalamud/Game/Addon/Lifecycle/AddonLifecycle.cs index afab05b19..6520ee4cf 100644 --- a/Dalamud/Game/Addon/Lifecycle/AddonLifecycle.cs +++ b/Dalamud/Game/Addon/Lifecycle/AddonLifecycle.cs @@ -64,7 +64,10 @@ internal unsafe class AddonLifecycle : IInternalDisposableService internal static AtkUnitBase.AtkUnitBaseVirtualTable* GetOriginalVirtualTable(AtkUnitBase.AtkUnitBaseVirtualTable* tableAddress) { var matchedTable = AllocatedTables.FirstOrDefault(table => table.ModifiedVirtualTable == tableAddress); - if (matchedTable == null) return null; + if (matchedTable == null) + { + return null; + } return matchedTable.OriginalVirtualTable; } @@ -153,13 +156,19 @@ internal unsafe class AddonLifecycle : IInternalDisposableService { 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 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); diff --git a/Dalamud/Game/Agent/AgentLifecycle.cs b/Dalamud/Game/Agent/AgentLifecycle.cs index 745b3f816..45f0dec5c 100644 --- a/Dalamud/Game/Agent/AgentLifecycle.cs +++ b/Dalamud/Game/Agent/AgentLifecycle.cs @@ -77,7 +77,10 @@ internal unsafe class AgentLifecycle : IInternalDisposableService internal static AgentInterface.AgentInterfaceVirtualTable* GetOriginalVirtualTable(AgentInterface.AgentInterfaceVirtualTable* tableAddress) { var matchedTable = AllocatedTables.FirstOrDefault(table => table.ModifiedVirtualTable == tableAddress); - if (matchedTable == null) return null; + if (matchedTable == null) + { + return null; + } return matchedTable.OriginalVirtualTable; } @@ -185,14 +188,18 @@ internal unsafe class AgentLifecycle : IInternalDisposableService if (!this.EventListeners.ContainsKey(listener.EventType)) { if (!this.EventListeners.TryAdd(listener.EventType, [])) + { return; + } } // 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].TryAdd(listener.AgentId, [])) + { return; + } } this.EventListeners[listener.EventType][listener.AgentId].Add(listener);