Fix fleets supporting armies into territories with 2 coasts

Oliveriver · Oct 3, 2024 · 734ff8e · 734ff8e
1 parent f043bfe
commit 734ff8e
Showing 1 changed file with 17 additions and 19 deletions.
diff --git a/server/Adjudication/Validation/AdjacencyValidator.cs b/server/Adjudication/Validation/AdjacencyValidator.cs
@@ -69,27 +69,25 @@ public bool IsValidIntraBoardMove(Unit unit, Location location, Location destina
 
         if (allowDestinationSibling)
         {
-            if (destinationRegion.ParentId != null)
-            {
-                var destinationRegionSiblings = regions.Where(r =>
-                    r != destinationRegion
-                    && r.ParentId == destinationRegion.ParentId);
+            var destinationRegionSiblings = regions.Where(r =>
+                r != destinationRegion
+                && (destinationRegion.ParentId != null || r.ParentId != null)
+                && (r.ParentId == destinationRegion.ParentId || r.ParentId == destinationRegion.Id || r.Id == destinationRegion.ParentId));
 
-                foreach (var siblingRegion in destinationRegionSiblings)
+            foreach (var siblingRegion in destinationRegionSiblings)
+            {
+                var sibling = new Location
+                {
+                    Timeline = destination.Timeline,
+                    Year = destination.Year,
+                    Phase = destination.Phase,
+                    RegionId = siblingRegion.Id,
+                };
+
+                var isValidMove = IsValidIntraBoardMove(unit, location, sibling, false, false);
+                if (isValidMove)
                 {
-                    var sibling = new Location
-                    {
-                        Timeline = destination.Timeline,
-                        Year = destination.Year,
-                        Phase = destination.Phase,
-                        RegionId = siblingRegion.Id,
-                    };
-
-                    var isValidMove = IsValidIntraBoardMove(unit, location, sibling, false, false);
-                    if (isValidMove)
-                    {
-                        return true;
-                    }
+                    return true;
                 }
             }
         }