From 8db4f88ecc462c84ad22cf996e31ffd7b14376d2 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 24 Jul 2020 12:56:30 -0400 Subject: [PATCH] Plastanium conveyor blend fix --- core/src/mindustry/world/Block.java | 4 ++++ .../mindustry/world/blocks/distribution/StackConveyor.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index e6324c4888..b524fadda3 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -603,6 +603,10 @@ public class Block extends UnlockableContent{ health = size * size * 40; } + if(group == BlockGroup.transportation || consumes.has(ConsumeType.item) || category == Category.distribution){ + acceptsItems = true; + } + offset = ((size + 1) % 2) * tilesize / 2f; buildCost = 0f; diff --git a/core/src/mindustry/world/blocks/distribution/StackConveyor.java b/core/src/mindustry/world/blocks/distribution/StackConveyor.java index 3619835d5f..efbdd701af 100644 --- a/core/src/mindustry/world/blocks/distribution/StackConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/StackConveyor.java @@ -57,7 +57,7 @@ public class StackConveyor extends Block implements Autotiler{ if(state == stateLoad){ //standard conveyor mode return otherblock.outputsItems() && lookingAtEither(tile, rotation, otherx, othery, otherrot, otherblock); }else if(state == stateUnload){ //router mode - return (otherblock.hasItems || otherblock.outputsItems() || otherblock.acceptsItems) && + return (otherblock.acceptsItems) && (notLookingAt(tile, rotation, otherx, othery, otherrot, otherblock) || (otherblock instanceof StackConveyor && facing(otherx, othery, otherrot, tile.x, tile.y))) && !(world.build(otherx, othery) instanceof StackConveyorEntity && ((StackConveyorEntity)world.build(otherx, othery)).state == stateUnload);