Merge pull request #406 from FFXIV-CombatReborn/crashfixes

Enhance thread safety and readability; add error handling
FFXIV-CombatReborn · Sep 24, 2024 · 477a8d4 · 477a8d4
2 parents 575c62c + 06fe16c
commit 477a8d4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/RotationSolver.Basic/Configuration/Configs.cs b/RotationSolver.Basic/Configuration/Configs.cs
@@ -1,6 +1,7 @@
 using Dalamud.Configuration;
 using ECommons.DalamudServices;
 using ECommons.ExcelServices;
+using System.Collections.Concurrent;
 using static RotationSolver.Basic.Configuration.ConfigTypes;
 
 namespace RotationSolver.Basic.Configuration;
@@ -689,15 +690,15 @@ public const string
     #endregion
 
     [JobConfig]
-    private readonly Dictionary<uint, ActionConfig> _rotationActionConfig = [];
+    private readonly ConcurrentDictionary<uint, ActionConfig> _rotationActionConfig = new ConcurrentDictionary<uint, ActionConfig>();
 
     [JobConfig]
-    private readonly Dictionary<uint, ItemConfig> _rotationItemConfig = [];
+    private readonly ConcurrentDictionary<uint, ItemConfig> _rotationItemConfig = new ConcurrentDictionary<uint, ItemConfig>();
 
     [JobChoiceConfig]
-    private readonly Dictionary<string, string> _rotationConfigurations = [];
+    private readonly ConcurrentDictionary<string, string> _rotationConfigurations = new ConcurrentDictionary<string, string>();
 
-    public Dictionary<uint, string> DutyRotationChoice { get; set; } = [];
+    public ConcurrentDictionary<uint, string> DutyRotationChoice = new ConcurrentDictionary<uint, string>();
 
     public void Save()
     {

diff --git a/RotationSolver.Basic/DataCenter.cs b/RotationSolver.Basic/DataCenter.cs
@@ -326,10 +326,13 @@ public static unsafe IBattleChara[] FriendlyNPCMembers
                 }
 
                 // Filter and cast objects safely
-                return Svc.Objects
-                    .Where(obj => obj != null && obj.ObjectKind == Dalamud.Game.ClientState.Objects.Enums.ObjectKind.BattleNpc && (obj.GetNameplateKind() == NameplateKind.FriendlyBattleNPC || obj.GetBattleNPCSubKind() == BattleNpcSubKind.NpcPartyMember))
+                var friendlyNpcs = Svc.Objects
+                    .Where(obj => obj != null && obj.ObjectKind == ObjectKind.BattleNpc)
+                    .Where(obj => obj.GetNameplateKind() == NameplateKind.FriendlyBattleNPC || obj.GetBattleNPCSubKind() == BattleNpcSubKind.NpcPartyMember)
                     .OfType<IBattleChara>()
                     .ToArray();
+
+                return friendlyNpcs;
             }
             catch (Exception ex)
             {

diff --git a/RotationSolver.Basic/Helpers/ObjectHelper.cs b/RotationSolver.Basic/Helpers/ObjectHelper.cs
@@ -175,10 +175,17 @@ internal static bool IsParty(this IGameObject gameObject)
                 // Add Player Chocobo Companion to Party List
                 unsafe
                 {
-                    BattleChara* companionChocobo = DataCenter.GetCompanion();
-                    if (companionChocobo != null)
+                    try
                     {
-                        return true;
+                        BattleChara* companionChocobo = DataCenter.GetCompanion();
+                        if (companionChocobo != null)
+                        {
+                            return true;
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Svc.Log.Error(ex, "Error accessing companionChocobo");
                     }
                 }
             }