From 7853767ee5a05431624668a252a0000375053365 Mon Sep 17 00:00:00 2001 From: Skat <55407440+skykatik@users.noreply.github.com> Date: Mon, 3 May 2021 04:18:22 +0400 Subject: [PATCH] Fix plastanium conveyor linking (#5185) --- core/assets/contributors | 3 ++- .../src/mindustry/world/blocks/distribution/StackConveyor.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/assets/contributors b/core/assets/contributors index 66a39da8c3..5470f14f5e 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -119,4 +119,5 @@ BTA_Susideur nilq AsgerHB AzCraft -foo \ No newline at end of file +foo +Skat diff --git a/core/src/mindustry/world/blocks/distribution/StackConveyor.java b/core/src/mindustry/world/blocks/distribution/StackConveyor.java index bdd5c50ef7..6427aa26c1 100644 --- a/core/src/mindustry/world/blocks/distribution/StackConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/StackConveyor.java @@ -63,6 +63,7 @@ public class StackConveyor extends Block implements Autotiler{ return otherblock.outputsItems() && lookingAtEither(tile, rotation, otherx, othery, otherrot, otherblock); }else if(state == stateUnload){ //router mode return otherblock.acceptsItems && + (!(otherblock instanceof ArmoredConveyor) || lookingAtEither(tile, rotation, otherx, othery, otherrot, otherblock)) && (notLookingAt(tile, rotation, otherx, othery, otherrot, otherblock) || (otherblock instanceof StackConveyor && facing(otherx, othery, otherrot, tile.x, tile.y))) && !(world.build(otherx, othery) instanceof StackConveyorBuild s && s.state == stateUnload) &&