From 2bd7c92b9e74296fc9a4607e96f795b861ace018 Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Mon, 10 Feb 2020 12:38:48 +0100 Subject: [PATCH] Allow sideloading the unloader Main reason for blendbits > 1 & 2 --- .../world/blocks/distribution/CraterConveyor.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/distribution/CraterConveyor.java b/core/src/mindustry/world/blocks/distribution/CraterConveyor.java index dc3a390f5d..bfb1a63575 100644 --- a/core/src/mindustry/world/blocks/distribution/CraterConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/CraterConveyor.java @@ -138,9 +138,14 @@ public class CraterConveyor extends Block implements Autotiler{ CraterConveyorEntity entity = tile.ent(); int[] bits = buildBlending(tile, tile.rotation(), null, true); + final boolean[] upstream = {false}; + upstream(tile, t -> { + if(t.block() instanceof CraterConveyor) upstream[0] = true; + }); + entity.blendbit2 = 0; if(bits[0] == 0 && blends(tile, tile.rotation(), 0) && !blends(tile, tile.rotation(), 2)) entity.blendbit2 = 5; // a 0 that faces into a crater conveyor with none behind it - if(bits[0] == 0 && !blends(tile, tile.rotation(), 0) && blends(tile, tile.rotation(), 2)) entity.blendbit2 = 6; // a 0 that faces into none with a crater conveyor behind it + if(upstream[0] && !blends(tile, tile.rotation(), 0)) entity.blendbit2 = 6; // a 0 that faces into none with a crater conveyor behind it entity.blendbit1 = bits[0]; entity.blendsclx = bits[1];