Fix missing builds

Oliveriver · Sep 17, 2024 · 071f94c · 071f94c
1 parent 60a7c72
commit 071f94c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/server/Adjudication/Execution/Executor.cs b/server/Adjudication/Execution/Executor.cs
@@ -148,13 +148,13 @@ private Board AdvanceMinorBoard(Board previousBoard)
 
         var localOrders = world.Orders.Where(o => previousBoard.Contains(o.Location));
 
-        var builds = localOrders.OfType<Build>();
+        var builds = localOrders.OfType<Build>().Where(b => b.Status == OrderStatus.Success);
         var disbands = localOrders.OfType<Disband>();
 
         var units = previousBoard.Units
-            .Where(u =>
-                !disbands.Any(d => d.Unit == u && d.Status == OrderStatus.Success)
-                && !builds.Any(b => b.Unit == u && b.Status != OrderStatus.Success))
+            .Concat(builds.Select(b => b.Unit))
+            .Where(u => !disbands.Any(d => d.Location == u.Location && d.Status == OrderStatus.Success))
+            .Distinct()
             .Select(u => u.Clone())
             .ToList();
 

diff --git a/server/Tests/Extensions/BoardExtensions.cs b/server/Tests/Extensions/BoardExtensions.cs
@@ -35,7 +35,6 @@ public static Build Build(this Board board, Nation owner, UnitType type, string
             Unit = unit,
         };
 
-        board.Units.Add(unit);
         world.Orders.Add(build);
         return build;
     }