Merge pull request #466 from FFXIV-CombatReborn/actioninvokefix

Update ECommons submodule and validate ClassJob in BaseAction
FFXIV-CombatReborn · Dec 5, 2024 · 0b56831 · 0b56831
2 parents 7958e28 + 4c7eedf
commit 0b56831
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/ECommons b/ECommons
diff --git a/RotationSolver.Basic/Actions/BaseAction.cs b/RotationSolver.Basic/Actions/BaseAction.cs
@@ -85,7 +85,15 @@ public ActionConfig Config
                 value = Setting.CreateConfig?.Invoke() ?? new ActionConfig();
                 Service.Config.RotationActionConfig[ID] = value;
 
+                if (!Action.ClassJob.IsValid)
+                {
+                    // Log the error for debugging purposes
+                    Svc.Log.Debug($"ClassJob is not valid for Action ID: {ID}");
+                    return value;
+                }
+
                 var classJob = Action.ClassJob.Value;
+
                 if (classJob.RowId != 0 && classJob.GetJobRole() == JobRole.Tank)
                 {
                     value.AoeCount = 2;
+3 −2		ECommons/ExcelServices/ExcelJobHelper.cs
+1 −1		ECommons/Logging/InternalLog.cs