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

Minor cleanup

Browse Source
This commit is contained in:
Anuken
2018-02-18 11:33:38 -05:00
parent 1c3bad0aca
commit 39db04872c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/version.properties
View File

@@ -1,5 +1,5 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Sun Feb 18 11:29:39 EST 2018 #Sun Feb 18 11:33:00 EST 2018
version=beta version=beta
androidBuildCode=235 androidBuildCode=235
name=Mindustry name=Mindustry

3
core/src/io/anuke/mindustry/world/blocks/types/distribution/Sorter.java
View File

@@ -46,7 +46,6 @@ public class Sorter extends Block{
@Override @Override
public boolean acceptItem(Item item, Tile tile, Tile source){ public boolean acceptItem(Item item, Tile tile, Tile source){
if(source.block() instanceof Sorter || source.block() instanceof Splitter) return false;
Tile to = getTileTarget(item, tile, source, false); Tile to = getTileTarget(item, tile, source, false);
return to != null && to.block().acceptItem(item, to, tile); return to != null && to.block().acceptItem(item, to, tile);
@@ -80,7 +79,7 @@ public class Sorter extends Block{
to = a; to = a;
}else if(bc && !ac){ }else if(bc && !ac){
to = b; to = b;
}else if(!bc && !ac){ }else if(!bc){
return null; return null;
}else{ }else{
if(dest.getDump() == 0){ if(dest.getDump() == 0){

7
core/src/io/anuke/mindustry/world/blocks/types/distribution/Splitter.java
View File

@@ -15,7 +15,6 @@ public class Splitter extends Block{
@Override @Override
public boolean acceptItem(Item item, Tile tile, Tile source){ public boolean acceptItem(Item item, Tile tile, Tile source){
if(source.block() instanceof Sorter || source.block() instanceof Splitter) return false;
Tile to = getTileTarget(item, tile, source, false); Tile to = getTileTarget(item, tile, source, false);
return to != null && to.block().acceptItem(item, to, tile); return to != null && to.block().acceptItem(item, to, tile);
@@ -35,8 +34,10 @@ public class Splitter extends Block{
Tile a = dest.getNearby(Mathf.mod(dir - 1, 4)); Tile a = dest.getNearby(Mathf.mod(dir - 1, 4));
Tile b = dest.getNearby(Mathf.mod(dir + 1, 4)); Tile b = dest.getNearby(Mathf.mod(dir + 1, 4));
boolean ac = a.block().acceptItem(item, a, dest); boolean ac = !(a.block().instantTransfer && source.block().instantTransfer) &&
boolean bc = b.block().acceptItem(item, b, dest); a.block().acceptItem(item, a, dest);
boolean bc = !(b.block().instantTransfer && source.block().instantTransfer) &&
b.block().acceptItem(item, b, dest);
if(ac && !bc){ if(ac && !bc){
to = a; to = a;