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

More logic commands

Browse Source
This commit is contained in:
Anuken
2020-10-06 14:03:21 -04:00
parent 9182b48b85
commit 2d539565c3
10 changed files with 63 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/entities/comp/MinerComp.java
+6 -2
View File
@@ -35,6 +35,11 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc, Unitc{
return mineTile != null && !(((Object)this) instanceof Builderc && ((Builderc)(Object)this).activelyBuilding());
}
public boolean validMine(Tile tile){
return !(tile == null || tile.block() != Blocks.air || !within(tile.worldx(), tile.worldy(), miningRange)
|| tile.drop() == null || !canMine(tile.drop()));
}
@Override
public void update(){
Building core = closestCore();
@@ -49,8 +54,7 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc, Unitc{
}
}
if(mineTile == null || core == null || mineTile.block() != Blocks.air || dst(mineTile.worldx(), mineTile.worldy()) > miningRange
|| mineTile.drop() == null || !canMine(mineTile.drop())){
if(core == null || !validMine(mineTile)){
mineTile = null;
mineTimer = 0f;
}else if(mining()){