Fix issues with pathing

FAForever · Sep 15, 2024 · 7d98fcb · 7d98fcb
1 parent eb8c5a2
commit 7d98fcb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/...ator/src/main/java/com/faforever/neroxis/generator/terrain/OneIslandTerrainGenerator.java b/...ator/src/main/java/com/faforever/neroxis/generator/terrain/OneIslandTerrainGenerator.java
@@ -56,9 +56,9 @@ protected void landSetup() {
         int minMiddlePoints = 2;
         int maxMiddlePoints = 4;
         int numTeamConnections = (int) (4 * landDensity + 4) / symmetrySettings.spawnSymmetry()
-                                                                                         .getNumSymPoints();
+                                                                               .getNumSymPoints();
         int numTeammateConnections = (int) (2 * landDensity + 2) / symmetrySettings.spawnSymmetry()
-                                                                                             .getNumSymPoints();
+                                                                                   .getNumSymPoints();
         int numWalkers = (int) (8 * landDensity + 8) / symmetrySettings.spawnSymmetry().getNumSymPoints();
         int bound = (int) (mapSize / 64 * (16 * (random.nextFloat() * .25f + (1 - landDensity) * .75f)))
                     + mapSize / 8;

diff --git a/shared/src/main/java/com/faforever/neroxis/mask/ComparableMask.java b/shared/src/main/java/com/faforever/neroxis/mask/ComparableMask.java
@@ -66,15 +66,21 @@ && valueAtGreaterThanEqualTo(x + 1, y,
                                                                                                                       &&
                                                                                                                       valueAtGreaterThanEqualTo(
                                                                                                                               x,
-                                                                                                                              y -
+                                                                                                                              y
+                                                                                                                              -
                                                                                                                               1,
-                                                                                                                              value)) &&
-                                                                                                                     (y <
-                                                                                                                      getSize() -
-                                                                                                                      1 &&
+                                                                                                                              value))
+                                                                                                                     &&
+                                                                                                                     (y
+                                                                                                                      <
+                                                                                                                      getSize()
+                                                                                                                      -
+                                                                                                                      1
+                                                                                                                      &&
                                                                                                                       valueAtGreaterThanEqualTo(
                                                                                                                               x,
-                                                                                                                              y +
+                                                                                                                              y
+                                                                                                                              +
                                                                                                                               1,
                                                                                                                               value))));
     }