diff --git a/core/assets/version.properties b/core/assets/version.properties index 5492ad5da9..86806cbab7 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Sun Feb 18 11:33:00 EST 2018 +#Sun Feb 18 12:25:44 EST 2018 version=beta -androidBuildCode=235 +androidBuildCode=236 name=Mindustry code=3.3 build=custom build diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Conveyor.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Conveyor.java index b412551773..2262004cd0 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Conveyor.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Conveyor.java @@ -163,10 +163,6 @@ public class Conveyor extends Block{ long result = ItemPos.packItem(item, y*0.9f, pos, (byte)Mathf.random(255)); boolean inserted = false; - if(pos <= 0.00001f && entity.minitem <= 0.001f){ - return; //TODO low fps stacked items: what now? - } - for(int i = 0; i < entity.convey.size; i ++){ if(compareItems(result, entity.convey.get(i)) < 0){ entity.convey.insert(i, result); diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Teleporter.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Teleporter.java index 22291f7f46..0591461d0a 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Teleporter.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Teleporter.java @@ -47,6 +47,7 @@ public class Teleporter extends PowerBlock{ solid = true; health = 80; powerCapacity = 30f; + instantTransfer = true; } @Override @@ -155,7 +156,7 @@ public class Teleporter extends PowerBlock{ public boolean available(Tile tile, Item item){ for(int i = 0; i < 4; i ++){ Tile next = tile.getNearby(i); - if(next != null && next.block().acceptItem(item, next, tile)){ + if(next != null && !(next.block().instantTransfer) && next.block().acceptItem(item, next, tile)){ return true; } }