mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-03-20 05:40:37 -07:00
Code Issues Projects Releases Wiki Activity

Fixed #8086 / Fixed #8065

Browse source
This commit is contained in:
Anuken 2023-01-07 12:15:37 -05:00
parent 0c9f2b2687
commit 98f869ecea
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/src/mindustry/entities/bullet/BulletType.java
View file

@ -581,7 +581,9 @@ public class BulletType extends Content implements Cloneable{
if(b.aimTile != null && b.aimTile.build != null && b.aimTile.build.team != b.team && collidesGround && !b.hasCollided(b.aimTile.build.id)){
target = b.aimTile.build;
}else{
target = Units.closestTarget(b.team, realAimX, realAimY, homingRange, e -> e.checkTarget(collidesAir, collidesGround) && !b.hasCollided(e.id), t -> collidesGround && !b.hasCollided(t.id));
target = Units.closestTarget(b.team, realAimX, realAimY, homingRange,
e -> e != null && e.checkTarget(collidesAir, collidesGround) && !b.hasCollided(e.id),
t -> t != null && collidesGround && !b.hasCollided(t.id));
}
}

2
core/src/mindustry/logic/LStatements.java
View file

@ -1453,7 +1453,7 @@ public class LStatements{
@RegisterStatement("cutscene")
public static class CutsceneStatement extends LStatement{
public CutsceneAction action = CutsceneAction.pan;
public String p1 = "100", p2 = "100", p3 = " 0.06", p4 = "0";
public String p1 = "100", p2 = "100", p3 = "0.06", p4 = "0";
@Override
public void build(Table table){