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

Minor bridge linking fix

Browse Source
This commit is contained in:
Anuken
2021-02-21 20:07:20 -05:00
parent e6787c5146
commit 9e8a2b8296
5 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/input/InputHandler.java
View File

@@ -859,6 +859,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
req.animScale = 1f;
lineRequests.add(req);
});
block.handlePlacementLine(lineRequests);
if(Core.settings.getBool("blockreplace")){
lineRequests.each(req -> {

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

@@ -12,16 +12,16 @@ import mindustry.world.blocks.distribution.*;
import static mindustry.Vars.*;
public class Placement{
private final static Seq<Point2> tmpPoints = new Seq<>(), tmpPoints2 = new Seq<>();
private static final Seq<Point2> tmpPoints = new Seq<>(), tmpPoints2 = new Seq<>();
private static final NormalizeResult result = new NormalizeResult();
private static final NormalizeDrawResult drawResult = new NormalizeDrawResult();
private static Bresenham2 bres = new Bresenham2();
private static Seq<Point2> points = new Seq<>();
private static final Bresenham2 bres = new Bresenham2();
private static final Seq<Point2> points = new Seq<>();
//for pathfinding
private static IntFloatMap costs = new IntFloatMap();
private static IntIntMap parents = new IntIntMap();
private static IntSet closed = new IntSet();
private static final IntFloatMap costs = new IntFloatMap();
private static final IntIntMap parents = new IntIntMap();
private static final IntSet closed = new IntSet();
/** Normalize a diagonal line into points. */
public static Seq<Point2> pathfindLine(boolean conveyors, int startX, int startY, int endX, int endY){

5
core/src/mindustry/world/Block.java
View File

@@ -403,6 +403,11 @@ public class Block extends UnlockableContent{
}
/** Mutates the given list of requests used during line placement. */
public void handlePlacementLine(Seq<BuildPlan> plans){
}
public Object nextConfig(){
if(saveConfig && lastConfig != null){
return lastConfig;

10
core/src/mindustry/world/blocks/distribution/ItemBridge.java
View File

@@ -176,11 +176,11 @@ public class ItemBridge extends Block{
public void playerPlaced(Object config){
super.playerPlaced(config);
if(config != null) return;
Tile link = findLink(tile.x, tile.y);
if(linkValid(tile, link) && !proximity.contains(link.build)){
link.build.configure(tile.pos());
if(config == null){
Tile link = findLink(tile.x, tile.y);
if(linkValid(tile, link) && !proximity.contains(link.build)){
link.build.configure(tile.pos());
}
}
lastBuild = this;