Fix unexplored map crash with units

FAForever · Apr 28, 2021 · 4c2cbc5 · 4c2cbc5
1 parent 6665a8c
commit 4c2cbc5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/src/main/java/com/faforever/neroxis/map/generator/prop/EnemyCivPropGenerator.java b/src/main/java/com/faforever/neroxis/map/generator/prop/EnemyCivPropGenerator.java
@@ -36,6 +36,8 @@ protected void setupCivilianPipeline() {
         if (!map.isUnexplored()) {
             baseMask.randomize(.005f).setSize(mapSize + 1);
             baseMask.multiply(passableLand.copy().subtract(unbuildable).deflate(24)).fillCenter(32, false).fillEdge(32, false);
+        } else {
+            baseMask.setSize(mapSize + 1);
         }
     }
 

diff --git a/src/main/java/com/faforever/neroxis/map/generator/prop/NeutralCivPropGenerator.java b/src/main/java/com/faforever/neroxis/map/generator/prop/NeutralCivPropGenerator.java
@@ -37,6 +37,8 @@ protected void setupCivilianPipeline() {
         if (!map.isUnexplored()) {
             civReclaimMask.randomize(.005f).setSize(mapSize + 1);
             civReclaimMask.multiply(passableLand.copy().subtract(unbuildable).deflate(24)).fillCenter(32, false).fillEdge(64, false);
+        } else {
+            civReclaimMask.setSize(mapSize + 1);
         }
     }
 

diff --git a/src/test/java/com/faforever/neroxis/map/generator/MapGeneratorTest.java b/src/test/java/com/faforever/neroxis/map/generator/MapGeneratorTest.java
@@ -373,7 +373,7 @@ public void TestEqualityBiomeSpecified() throws Exception {
 
     @Test
     public void TestUnexploredNoUnits() throws Exception {
-        for (int i = 0; i < 5; ++i) {
+        for (int i = 0; i < 10; ++i) {
             Pipeline.reset();
             instance = new MapGenerator();
             instance.interpretArguments(new String[]{"--unexplored", "--map-size", "256"});