From f50ee2ecf26efaa81aac63738b5901b965b27ee6 Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Fri, 6 Mar 2020 09:52:28 +0100 Subject: [PATCH] Try to clean up the end of tile logic --- .../world/blocks/distribution/CraterConveyor.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/core/src/mindustry/world/blocks/distribution/CraterConveyor.java b/core/src/mindustry/world/blocks/distribution/CraterConveyor.java index c462b14274..080a846ce0 100644 --- a/core/src/mindustry/world/blocks/distribution/CraterConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/CraterConveyor.java @@ -159,14 +159,12 @@ public class CraterConveyor extends Block implements Autotiler{ if(entity.reload > 0f) return; - // unload - if(entity.blendbit2 == 6 && entity.from != tile.pos()){ - while(true) if(!tryDump(tile)) break; // unload as much as possible + if(entity.blendbit2 == 6){ // unload + while(true){ + if(!tryDump(tile)) break; + } if(entity.items.total() == 0) poofOut(tile); - } - - // transfer - if(shouldLaunch(tile)){ + }else if(shouldLaunch(tile)){ // transfer Tile destination = tile.front(); if(destination != null && destination.getTeam() == tile.getTeam() && destination.block() instanceof CraterConveyor){