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

Status apply instruction / Bugfixes

Browse Source
This commit is contained in:
Anuken
2022-05-09 04:10:18 -04:00
parent aace191116
commit eb52c6d61f
7 changed files with 107 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/input/Placement.java
View File

@@ -175,7 +175,7 @@ public class Placement{
plans.set(result);
}
public static void calculateBridges(Seq<BuildPlan> plans, DirectionBridge bridge, boolean hasJunction){
public static void calculateBridges(Seq<BuildPlan> plans, DirectionBridge bridge, boolean hasJunction, Boolf<Block> same){
if(isSidePlace(plans)) return;
//check for orthogonal placement + unlocked state
@@ -185,9 +185,9 @@ public class Placement{
//TODO for chains of ducts, do not count consecutives in a different rotation as 'placeable'
Boolf<BuildPlan> placeable = plan ->
!(!hasJunction && plan.build() != null && plan.build().block == plan.block && plan.rotation != plan.build().rotation) &&
!(!hasJunction && plan.build() != null && same.get(plan.build().block) && plan.rotation != plan.build().rotation) &&
(plan.placeable(player.team()) ||
(plan.tile() != null && plan.tile().block() == plan.block)); //don't count the same block as inaccessible
(plan.tile() != null && same.get(plan.tile().block()))); //don't count the same block as inaccessible
var result = plans1.clear();