Merge pull request #438 from FFXIV-CombatReborn/more-redtext-fixes

Update ECommons submodule and improve null safety

RotationSolver.Basic/DataCenter.cs

@@ -463,12 +463,12 @@ public static IBattleChara? DispelTarget
     {
         get
         {
-            var weakenPeople =
-                DataCenter.PartyMembers.Where(o => o is IBattleChara b && b.StatusList.Any(StatusHelper.CanDispel));
-            var weakenNPC =
-                DataCenter.FriendlyNPCMembers.Where(o => o is IBattleChara b && b.StatusList.Any(StatusHelper.CanDispel));
-            var dyingPeople =
-                weakenPeople.Where(o => o is IBattleChara b && b.StatusList.Any(StatusHelper.IsDangerous));
+            var weakenPeople = DataCenter.PartyMembers
+                .Where(o => o is IBattleChara b && b.StatusList != null && b.StatusList.Any(StatusHelper.CanDispel));
+            var weakenNPC = DataCenter.FriendlyNPCMembers
+                .Where(o => o is IBattleChara b && b.StatusList != null && b.StatusList.Any(StatusHelper.CanDispel));
+            var dyingPeople = weakenPeople
+                .Where(o => o is IBattleChara b && b.StatusList != null && b.StatusList.Any(StatusHelper.IsDangerous));
 
             return dyingPeople.OrderBy(ObjectHelper.DistanceToPlayer).FirstOrDefault()
                    ?? weakenPeople.OrderBy(ObjectHelper.DistanceToPlayer).FirstOrDefault()

RotationSolver/RotationSolverPlugin.cs

@@ -42,7 +42,10 @@ public sealed class RotationSolverPlugin : IDalamudPlugin, IDisposable
     public RotationSolverPlugin(IDalamudPluginInterface pluginInterface)
     {
         ECommonsMain.Init(pluginInterface, this, ECommons.Module.DalamudReflector, ECommons.Module.ObjectFunctions);
-        ThreadLoadImageHandler.TryGetIconTextureWrap(0, true, out _);
+        Svc.Framework.RunOnTick(() =>
+        {
+            ThreadLoadImageHandler.TryGetIconTextureWrap(0, true, out _);
+        });
         IconSet.Init();
 
         _dis.Add(new Service());