diff --git a/core/assets-raw/sprites/blocks/pulseconduit.png b/core/assets-raw/sprites/blocks/pulseconduit.png index c047ea56c3..8a634d9746 100644 Binary files a/core/assets-raw/sprites/blocks/pulseconduit.png and b/core/assets-raw/sprites/blocks/pulseconduit.png differ diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 75a3e8ef73..3128bc3c6d 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/version.properties b/core/assets/version.properties index 3816567416..270e8c43c8 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Fri Feb 09 00:15:08 EST 2018 +#Fri Feb 09 10:08:05 EST 2018 version=beta -androidBuildCode=131 +androidBuildCode=135 name=Mindustry code=3.3 -build=custom build +build=20 diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/LiquidJunction.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/LiquidJunction.java index 7cc8e9da1e..e604e8c5af 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/LiquidJunction.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/LiquidJunction.java @@ -3,6 +3,7 @@ package io.anuke.mindustry.world.blocks.types.distribution; import io.anuke.mindustry.resource.Liquid; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.types.LiquidBlock; +import io.anuke.ucore.core.Timers; import io.anuke.ucore.graphics.Draw; public class LiquidJunction extends Conduit{ @@ -24,9 +25,11 @@ public class LiquidJunction extends Conduit{ int dir = source.relativeTo(tile.x, tile.y); dir = (dir+4)%4; Tile to = tile.getNearby(dir); - - ((LiquidBlock)to.block()).handleLiquid(to, tile, liquid, amount); - + + Timers.run(20f, () -> { + if(to.block() instanceof LiquidBlock && ((LiquidBlock)to.block()).acceptLiquid(to, tile, liquid, amount)) + ((LiquidBlock)to.block()).handleLiquid(to, tile, liquid, amount); + }); } @Override @@ -34,7 +37,7 @@ public class LiquidJunction extends Conduit{ int dir = source.relativeTo(dest.x, dest.y); dir = (dir+4)%4; Tile to = dest.getNearby(dir); - return to != null && to.block() != this && to.block() instanceof LiquidBlock && + return to != null && to.block() instanceof LiquidBlock && ((LiquidBlock)to.block()).acceptLiquid(to, dest, liquid, amount); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConveyor.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConveyor.java index 9e96bcb4d9..fa64fdf635 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConveyor.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConveyor.java @@ -10,7 +10,7 @@ import io.anuke.ucore.util.Bits; public class TunnelConveyor extends Block{ protected int maxdist = 3; - protected float speed = 50; //frames taken to go through this tunnel + protected float speed = 53; //frames taken to go through this tunnel protected int capacity = 32; protected TunnelConveyor(String name) { @@ -78,7 +78,7 @@ public class TunnelConveyor extends Block{ if(tunnel != null){ Tile to = tunnel.getNearby(tunnel.getRotation()); - return to != null && !(to.block() instanceof TunnelConveyor) && to.block().acceptItem(item, to, tunnel); + return to != null && to.block().acceptItem(item, to, tunnel); }else{ return false; }