Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages 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)){ 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; target = b.aimTile.build;
}else{ }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") @RegisterStatement("cutscene")
public static class CutsceneStatement extends LStatement{ public static class CutsceneStatement extends LStatement{
public CutsceneAction action = CutsceneAction.pan; 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 @Override
public void build(Table table){ public void build(Table table){