From 12c3b22b7c6b1609fc10903e18a400cf2b92c1c7 Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Tue, 7 Jan 2020 10:44:37 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20poofing=20=C2=AC=20working=20if=20conveyo?= =?UTF-8?q?r=20was=20backed=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../world/blocks/distribution/CraterConveyor.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/distribution/CraterConveyor.java b/core/src/mindustry/world/blocks/distribution/CraterConveyor.java index f817e7837c..8c1d37e505 100644 --- a/core/src/mindustry/world/blocks/distribution/CraterConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/CraterConveyor.java @@ -107,7 +107,6 @@ public class CraterConveyor extends BaseConveyor{ }else{ // poof out crater if(entity.items.total() == 0){ - Effects.effect(Fx.plasticburn, tile.drawx(), tile.drawy()); entity.link = Pos.invalid; return; } @@ -129,6 +128,7 @@ public class CraterConveyor extends BaseConveyor{ if(entity.reload < 0.25f){ if(!(destination.block() instanceof CraterConveyor) && (entity.link != tile.pos() || !isStart(tile))){ // ...and if its not a crater conveyor, start unloading (everything) while(entity.items.total() > 0 && entity.dominant() != null && offloadDir(tile, entity.dominant())) entity.items.remove(entity.dominant(), 1); + if(entity.items.total() == 0) Effects.effect(Fx.plasticburn, tile.drawx(), tile.drawy()); } } @@ -198,6 +198,13 @@ public class CraterConveyor extends BaseConveyor{ return true; } + @Override + public int removeStack(Tile tile, Item item, int amount){ + int i = super.removeStack(tile, item, amount); + if(tile.entity.items.total() == 0) Effects.effect(Fx.plasticburn, tile.drawx(), tile.drawy()); + return i; + } + @Override public int getMaximumAccepted(Tile tile, Item item){ return Mathf.round(super.getMaximumAccepted(tile, item) * tile.entity.timeScale);