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

Allow conveyors/ducts to use duct/conveyor bridges (#10179)

Browse Source 
* Allow conveyors/ducts to use duct/conveyor bridges

* Apply suggestions from code review

---------

Co-authored-by: Anuken <arnukren@gmail.com>
This commit is contained in:
patatayui
2025-02-10 17:04:14 +01:00
committed by GitHub
parent 73bde0d3af
commit 5f8f0140a2
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,10 +129,10 @@ public class Placement{
}
public static void calculateBridges(Seq<BuildPlan> plans, ItemBridge bridge){
calculateBridges(plans, bridge, t -> false);
calculateBridges(plans, bridge, false, t -> false);
}
public static void calculateBridges(Seq<BuildPlan> plans, ItemBridge bridge, Boolf<Block> avoid){
public static void calculateBridges(Seq<BuildPlan> plans, ItemBridge bridge, boolean hasJunction, Boolf<Block> avoid){
if(isSidePlace(plans) || plans.size == 0) return;
//check for orthogonal placement + unlocked state
@@ -170,7 +170,7 @@ public class Placement{
continue outer;
}else if(placeable.get(other)){
if(wereSame){
if(wereSame && hasJunction){
//the gap is fake, it's just conveyors that can be replaced with junctions
i ++;
continue outer;