Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc fixes and unit selection tweaks

Browse Source
This commit is contained in:
Anuken
2024-11-27 21:51:13 -05:00
parent ec0ba9f424
commit 0f492e0c7a
4 changed files with 47 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/maps/filters/GenerateFilter.java
+9 -5
View File
@@ -35,10 +35,12 @@ public abstract class GenerateFilter implements Cloneable{
Tile tile = tiles.geti(i);
long b = buffer[i];
Block block = Vars.content.block(PackTile.block(b)), floor = Vars.content.block(PackTile.floor(b)), overlay = Vars.content.block(PackTile.overlay(b));
Block block = Vars.content.block(PackTile.block(b)), floorb = Vars.content.block(PackTile.floor(b)), overlay = Vars.content.block(PackTile.overlay(b));
tile.setFloor(floor.asFloor());
tile.setOverlay(!floor.asFloor().hasSurface() && overlay.asFloor().needsSurface && overlay instanceof OreBlock ? Blocks.air : overlay);
if(floorb instanceof Floor floor){
tile.setFloor(floor);
tile.setOverlay(!floor.hasSurface() && overlay.asFloor().needsSurface && overlay instanceof OreBlock ? Blocks.air : overlay);
}
if(!tile.block().synthetic() && !block.synthetic()){
tile.setBlock(block);
@@ -49,8 +51,10 @@ public abstract class GenerateFilter implements Cloneable{
in.set(tile.x, tile.y, tile.block(), tile.floor(), tile.overlay());
apply(in);
tile.setFloor(in.floor.asFloor());
tile.setOverlay(!in.floor.asFloor().hasSurface() && in.overlay.asFloor().needsSurface && in.overlay instanceof OreBlock ? Blocks.air : in.overlay);
if(in.floor instanceof Floor floor){
tile.setFloor(floor);
tile.setOverlay(!floor.hasSurface() && in.overlay.asFloor().needsSurface && in.overlay instanceof OreBlock ? Blocks.air : in.overlay);
}
if(!tile.block().synthetic() && !in.block.synthetic()){
tile.setBlock(in.block);