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

Homing on healing bullets does not take collided into account (#6276)

Browse Source
This commit is contained in:
Matthew Peng
2021-10-31 13:03:19 -04:00
committed by GitHub
parent 24810ddbf5
commit 4999c25723
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/entities/bullet/BulletType.java
+3 -2
View File
@@ -359,8 +359,9 @@ public class BulletType extends Content implements Cloneable{
//home in on allies if possible //home in on allies if possible
if(healPercent > 0){ if(healPercent > 0){
target = Units.closestTarget(null, b.x, b.y, homingRange, target = Units.closestTarget(null, b.x, b.y, homingRange,
e -> e.checkTarget(collidesAir, collidesGround) && e.team != b.team, e -> e.checkTarget(collidesAir, collidesGround) && e.team != b.team && !b.hasCollided(e.id),
t -> collidesGround && (t.team != b.team || t.damaged())); t -> collidesGround && (t.team != b.team || t.damaged()) && !b.hasCollided(t.id)
);
}else{ }else{
target = Units.closestTarget(b.team, b.x, b.y, homingRange, e -> e.checkTarget(collidesAir, collidesGround) && !b.hasCollided(e.id), t -> collidesGround && !b.hasCollided(t.id)); target = Units.closestTarget(b.team, b.x, b.y, homingRange, e -> e.checkTarget(collidesAir, collidesGround) && !b.hasCollided(e.id), t -> collidesGround && !b.hasCollided(t.id));
} }