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

Fixed #7303 / Fixed #7302

Browse Source
This commit is contained in:
Anuken
2022-08-05 14:25:37 -04:00
parent 8b6d3a67f3
commit 6a5d7da4ae
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/entities/comp/BuilderComp.java
View File

@@ -98,8 +98,9 @@ abstract class BuilderComp implements Posc, Statusc, Teamc, Rotc{
//find the next build plan //find the next build plan
if(plans.size > 1){ if(plans.size > 1){
int total = 0; int total = 0;
int size = plans.size;
BuildPlan plan; BuildPlan plan;
while((!within((plan = buildPlan()).tile(), finalPlaceDst) || shouldSkip(plan, core)) && total < plans.size){ while((!within((plan = buildPlan()).tile(), finalPlaceDst) || shouldSkip(plan, core)) && total < size){
plans.removeFirst(); plans.removeFirst();
plans.addLast(plan); plans.addLast(plan);
total++; total++;

2
core/src/mindustry/world/blocks/distribution/Duct.java
View File

@@ -96,7 +96,7 @@ public class Duct extends Block implements Autotiler{
@Override @Override
public void handlePlacementLine(Seq<BuildPlan> plans){ public void handlePlacementLine(Seq<BuildPlan> plans){
Placement.calculateBridges(plans, (DuctBridge)Blocks.ductBridge, false, b -> b instanceof Duct); Placement.calculateBridges(plans, (DuctBridge)Blocks.ductBridge, false, b -> b instanceof Duct || b instanceof StackConveyor || b instanceof Conveyor);
} }
public class DuctBuild extends Building{ public class DuctBuild extends Building{

2
core/src/mindustry/world/blocks/payloads/BuildPayload.java
View File

@@ -101,7 +101,7 @@ public class BuildPayload implements Payload{
Draw.z(prevZ - 0.0001f); Draw.z(prevZ - 0.0001f);
drawShadow(1f); drawShadow(1f);
Draw.z(prevZ); Draw.z(prevZ);
Draw.zTransform(z -> z >= Layer.flyingUnitLow ? z : 0.0011f + Mathf.clamp(z, prevZ - 0.001f, prevZ + 0.9f)); Draw.zTransform(z -> z >= Layer.flyingUnitLow + 1f ? z : 0.0011f + Math.min(Mathf.clamp(z, prevZ - 0.001f, prevZ + 0.9f), Layer.flyingUnitLow - 1f));
build.tile = emptyTile; build.tile = emptyTile;
build.payloadDraw(); build.payloadDraw();
Draw.zTransform(); Draw.zTransform();