Shader crash fix / More blocks / Kiln / Removed (unused) flux

2019-01-30 22:51:24 -05:00
parent 43bff5c34d
commit e6a39a8255
20 changed files with 1965 additions and 2001 deletions
--- a/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java
+++ b/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java
@@ -92,7 +92,7 @@ public class MapGenerator extends Generator{

                if((tile.block() instanceof StaticWall
                    && tiles[newX][newY].block() instanceof StaticWall)
-                    || tile.block() == Blocks.air
+                    || (tile.block() == Blocks.air && !tiles[newX][newY].block().synthetic())
                    || (tiles[newX][newY].block() == Blocks.air && tile.block() instanceof StaticWall)){
                    tile.setBlock(tiles[newX][newY].block());
                }