Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed tunnel acceptance algorithm

Browse Source
This commit is contained in:
Anuken
2018-03-30 18:05:58 -04:00
parent f0302ca7dc
commit 84548187f5
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/assets/version.properties
View File

@@ -1,7 +1,7 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Wed Mar 28 09:37:55 EDT 2018 #Fri Mar 30 18:03:34 EDT 2018
version=release version=release
androidBuildCode=477 androidBuildCode=478
name=Mindustry name=Mindustry
code=3.5 code=3.5
build=custom build build=custom build

14
core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConveyor.java
View File

@@ -71,19 +71,7 @@ public class TunnelConveyor extends Block{
@Override @Override
public boolean acceptItem(Item item, Tile tile, Tile source){ public boolean acceptItem(Item item, Tile tile, Tile source){
TunnelEntity entity = tile.entity(); TunnelEntity entity = tile.entity();
return entity.index < entity.buffer.length - 1;
if(entity.index >= entity.buffer.length - 1) return false;
int rot = source.relativeTo(tile.x, tile.y);
if(rot != (tile.getRotation() + 2)%4) return false;
Tile tunnel = getDestTunnel(tile, item);
if(tunnel != null){
Tile to = tunnel.getNearby(tunnel.getRotation());
return to != null && to.block().acceptItem(item, to, tunnel);
}else{
return false;
}
} }
@Override @Override