Only validate active mods for cyclics

anno-mods · Apr 7, 2023 · 9824f06 · 9824f06
1 parent eb12a99
commit 9824f06
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/ModManager_Classes/Validation/CyclicDependencyValidator.cs b/ModManager_Classes/Validation/CyclicDependencyValidator.cs
@@ -13,6 +13,8 @@ internal class CyclicDependencyValidator : IModValidator
     {
         public void Validate(IEnumerable<Mod> changed, IReadOnlyCollection<Mod> all)
         {
+            foreach (Mod x in all)
+                x.Attributes.RemoveAttributesByType(AttributeType.CyclicDependency);
             foreach (Mod x in changed)
             {
                 var cyclics = CyclicDependencies(x, all);
@@ -25,8 +27,11 @@ public void Validate(IEnumerable<Mod> changed, IReadOnlyCollection<Mod> all)
 
         private IEnumerable<Mod> CyclicDependencies(Mod x, IReadOnlyCollection<Mod> others)
         {
+            if (!x.IsActive)
+                return Enumerable.Empty<Mod>();
+
             return others.Where(y =>
-                (y.Modinfo?.LoadAfterIds?.Contains(x.ModID) ?? false)
+                y.IsActive && (y.Modinfo?.LoadAfterIds?.Contains(x.ModID) ?? false)
                 && (x.Modinfo?.LoadAfterIds?.Contains(y.ModID) ?? false));
         }
     }