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

PR cleanup

Browse Source
This commit is contained in:
Anuken
2021-08-21 11:34:05 -04:00
parent 9cc08ada22
commit f85c078de8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -326,7 +326,7 @@ public class Turret extends ReloadTurret{
} }
protected boolean canHeal(){ protected boolean canHeal(){
return hasAmmo() && targetHealing && peekAmmo().collidesTeam && peekAmmo().healPercent > 0; return targetHealing && hasAmmo() && peekAmmo().collidesTeam && peekAmmo().healPercent > 0;
} }
protected void findTarget(){ protected void findTarget(){
@@ -336,7 +336,7 @@ public class Turret extends ReloadTurret{
target = Units.bestTarget(team, x, y, range, e -> !e.dead() && (e.isGrounded() || targetAir) && (!e.isGrounded() || targetGround), b -> true, unitSort); target = Units.bestTarget(team, x, y, range, e -> !e.dead() && (e.isGrounded() || targetAir) && (!e.isGrounded() || targetGround), b -> true, unitSort);
if(target == null && canHeal()){ if(target == null && canHeal()){
target = Units.findAllyTile(team, x, y, range, b -> b.damaged() && b != self()); target = Units.findAllyTile(team, x, y, range, b -> b.damaged() && b != this);
} }
} }
} }