From 98f869ecea2b5113af02cf69972d59bf3be104d8 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 7 Jan 2023 12:15:37 -0500 Subject: [PATCH] Fixed #8086 / Fixed #8065 --- core/src/mindustry/entities/bullet/BulletType.java | 4 +++- core/src/mindustry/logic/LStatements.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index a0fddc0772..26fccf1673 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -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)); } } diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java index 6f22b3c158..2e54844f4f 100644 --- a/core/src/mindustry/logic/LStatements.java +++ b/core/src/mindustry/logic/LStatements.java @@ -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){