From a7b80f025cde55867d710f7e6bafd1277e6de366 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 4 Apr 2020 15:08:08 -0400 Subject: [PATCH] Bugfixes --- .../world/blocks/distribution/ItemBridge.java | 14 +++++++++----- .../world/blocks/liquid/LiquidBridge.java | 2 ++ .../world/blocks/liquid/LiquidExtendingBridge.java | 2 ++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/core/src/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/mindustry/world/blocks/distribution/ItemBridge.java index 8cb14f9d53..26f3728028 100644 --- a/core/src/mindustry/world/blocks/distribution/ItemBridge.java +++ b/core/src/mindustry/world/blocks/distribution/ItemBridge.java @@ -181,11 +181,7 @@ public class ItemBridge extends Block{ return true; } - @Override - public void updateTile(){ - time += cycleSpeed * delta(); - time2 += (cycleSpeed - 1f) * delta(); - + public void checkIncoming(){ IntSetIterator it = incoming.iterator(); while(it.hasNext){ int i = it.next(); @@ -194,6 +190,14 @@ public class ItemBridge extends Block{ it.remove(); } } + } + + @Override + public void updateTile(){ + time += cycleSpeed * delta(); + time2 += (cycleSpeed - 1f) * delta(); + + checkIncoming(); Tile other = world.tile(link); if(!linkValid(tile, other)){ diff --git a/core/src/mindustry/world/blocks/liquid/LiquidBridge.java b/core/src/mindustry/world/blocks/liquid/LiquidBridge.java index 95ae48edc8..157716c810 100644 --- a/core/src/mindustry/world/blocks/liquid/LiquidBridge.java +++ b/core/src/mindustry/world/blocks/liquid/LiquidBridge.java @@ -24,6 +24,8 @@ public class LiquidBridge extends ItemBridge{ time += cycleSpeed * delta(); time2 += (cycleSpeed - 1f) * delta(); + checkIncoming(); + Tilec other = world.ent(link); if(other == null || !linkValid(tile, other.tile())){ dumpLiquid(liquids.current()); diff --git a/core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java b/core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java index 2089a91a69..16576607ea 100644 --- a/core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java +++ b/core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java @@ -24,6 +24,8 @@ public class LiquidExtendingBridge extends ExtendingItemBridge{ time += cycleSpeed * delta(); time2 += (cycleSpeed - 1f) * delta(); + checkIncoming(); + Tilec other = world.ent(link); if(other == null || !linkValid(tile, other.tile())){ dumpLiquid(liquids.current());