Merge branch 'main' into docker

server/.editorconfig

@@ -141,8 +141,8 @@ dotnet_style_require_accessibility_modifiers = for_non_interface_members:error
 dotnet_style_allow_multiple_blank_lines_experimental = false:error
 dotnet_style_allow_statement_immediately_after_block_experimental = false:error
 dotnet_code_quality_unused_parameters = all:error
-dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:error
-dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:error
+dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:error
+dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:error
 dotnet_style_parentheses_in_other_binary_operators = never_if_unnecessary:error
 dotnet_style_parentheses_in_other_operators = never_if_unnecessary:error
 dotnet_style_qualification_for_field = false:error

server/Adjudication/Execution/Executor.cs

@@ -10,7 +10,7 @@ public class Executor(World world, List<Region> regions)
     private readonly List<Unit> originalRetreatingUnits = world.Boards.SelectMany(b => b.Units).Where(u => u!.MustRetreat).ToList();
 
     private readonly List<Region> regions = regions;
-    private readonly MapComparer mapComparer = new();
+    private readonly MapComparer mapComparer = new(world.Orders.OfType<Build>().ToList());
 
     public void ExecuteOrders()
     {

server/Adjudication/Execution/MapComparer.cs

@@ -2,11 +2,13 @@
 
 namespace Adjudication;
 
-public class MapComparer : EqualityComparer<Board>
+public class MapComparer(List<Build> builds) : EqualityComparer<Board>
 {
     private readonly CentreComparer centreComparer = new();
     private readonly UnitComparer unitComparer = new();
 
+    private readonly List<Build> builds = builds;
+
     public override bool Equals(Board? x, Board? y)
     {
         if (x == null || y == null)
@@ -24,10 +26,10 @@ public override bool Equals(Board? x, Board? y)
             return false;
         }
 
-        var hasMatchingUnits = x.Units
-            .OrderBy(u => u.Location.RegionId)
-            .SequenceEqual(y.Units.OrderBy(u => u.Location.RegionId),
-            unitComparer);
+        var xUnits = x.Units.Where(u => !builds.Any(b => b.Unit == u)).OrderBy(u => u.Location.RegionId);
+        var yUnits = y.Units.Where(u => !builds.Any(b => b.Unit == u)).OrderBy(u => u.Location.RegionId);
+
+        var hasMatchingUnits = xUnits.SequenceEqual(yUnits, unitComparer);
 
         return hasMatchingUnits;
     }

server/Adjudication/Validation/ConvoyPathValidator.cs

@@ -103,7 +103,7 @@ private class DepthFirstConvoySearch(List<Convoy> convoys, AdjacencyValidator ad
 
         public List<Convoy> GetPossibleConvoys(Unit unit, Location location, Location destination)
         {
-            if (adjacencyValidator.IsValidDirectMove(unit, location, destination))
+            if (adjacencyValidator.IsValidDirectMove(unit, location, destination, allowDestinationChild: true))
             {
                 if (location == convoys.FirstOrDefault()?.Midpoint)
                 {