Fixed sector generate producing inconsistent results

Anuken · Dec 14, 2024 · fc5b508 · fc5b508
1 parent 30328e6
commit fc5b508
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/core/src/mindustry/editor/SectorGenerateDialog.java b/core/src/mindustry/editor/SectorGenerateDialog.java
@@ -93,6 +93,7 @@ void apply(){
                 var preset = sectorobj.preset;
                 sectorobj.preset = null;
 
+                logic.reset(); //TODO: is this a good idea? all rules and map state are cleared, but it fixes inconsistent gen
                 world.loadSector(sectorobj, seed, false);
 
                 sectorobj.preset = preset;

diff --git a/core/src/mindustry/maps/generators/BaseGenerator.java b/core/src/mindustry/maps/generators/BaseGenerator.java
@@ -209,10 +209,12 @@ public static boolean tryPlace(BasePart part, int x, int y, Team team, Rand rand
         int cx = x - (int)rotator.x;
         int cy = y - (int)rotator.y;
 
-        for(Stile tile : result.tiles){
-            int realX = tile.x + cx, realY = tile.y + cy;
-            if(!insanity && isTaken(tile.block, realX, realY)){
-                return false;
+        if(!insanity){
+            for(Stile tile : result.tiles){
+                int realX = tile.x + cx, realY = tile.y + cy;
+                if(isTaken(tile.block, realX, realY)){
+                    return false;
+                }
             }
         }