diff --git a/core/src/mindustry/content/SerpuloTechTree.java b/core/src/mindustry/content/SerpuloTechTree.java index 9517c5ebdf..062f8b3029 100644 --- a/core/src/mindustry/content/SerpuloTechTree.java +++ b/core/src/mindustry/content/SerpuloTechTree.java @@ -16,7 +16,6 @@ public class SerpuloTechTree{ Planets.serpulo.techTree = nodeRoot("serpulo", coreShard, () -> { node(conveyor, () -> { - node(junction, () -> { node(router, () -> { node(advancedLaunchPad, Seq.with(new SectorComplete(extractionOutpost)), () -> { @@ -73,7 +72,6 @@ public class SerpuloTechTree{ }); node(mechanicalDrill, () -> { - node(mechanicalPump, () -> { node(conduit, () -> { node(liquidJunction, () -> { diff --git a/core/src/mindustry/world/Build.java b/core/src/mindustry/world/Build.java index 9de54662ae..db70f50a96 100644 --- a/core/src/mindustry/world/Build.java +++ b/core/src/mindustry/world/Build.java @@ -96,6 +96,7 @@ public class Build{ tile.build.changeTeam(team); tile.build.enabled = true; tile.build.checkAllowUpdate(); + tile.build.updateProximity(); tile.build.onRepaired(); if(unit != null && unit.getControllerName() != null) tile.build.lastAccessed = unit.getControllerName(); diff --git a/core/src/mindustry/world/blocks/distribution/StackConveyor.java b/core/src/mindustry/world/blocks/distribution/StackConveyor.java index 9bf0bcf4cf..406d44ecdb 100644 --- a/core/src/mindustry/world/blocks/distribution/StackConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/StackConveyor.java @@ -193,7 +193,12 @@ public class StackConveyor extends Block implements Autotiler{ public void dropped(){ super.dropped(); var prev = Geometry.d4[(rotation + 2) % 4]; - link = Point2.pack(tile.x + prev.x, tile.y + prev.y); + if(items.any()){ + link = Point2.pack(tile.x + prev.x, tile.y + prev.y); + cooldown = 0f; + }else{ + link = -1; + } } @Override @@ -201,7 +206,7 @@ public class StackConveyor extends Block implements Autotiler{ Draw.z(Layer.block - 0.15f); super.drawCracks(); } - + @Override public void payloadDraw(){ Draw.rect(block.fullIcon, x, y); @@ -294,7 +299,6 @@ public class StackConveyor extends Block implements Autotiler{ }else{ //transfer if(state != stateLoad || (items.total() >= getMaximumAccepted(lastItem))){ if(front() instanceof StackConveyorBuild e && e.team == team){ - //sleep if its occupied if(e.link == -1){ e.items.add(items); e.lastItem = lastItem;