From 7924d9b9ef30e2a2e49c824dab5c6e5cc5c90a33 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 25 Mar 2021 12:51:24 -0400 Subject: [PATCH] Fixed #4993 --- core/src/mindustry/ai/Pathfinder.java | 6 +++--- core/src/mindustry/entities/units/AIController.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/ai/Pathfinder.java b/core/src/mindustry/ai/Pathfinder.java index e435364d68..8216c78123 100644 --- a/core/src/mindustry/ai/Pathfinder.java +++ b/core/src/mindustry/ai/Pathfinder.java @@ -108,7 +108,7 @@ public class Pathfinder implements Runnable{ /** Packs a tile into its internal representation. */ private int packTile(Tile tile){ - boolean nearLiquid = false, nearSolid = false, nearGround = false; + boolean nearLiquid = false, nearSolid = false, nearGround = false, solid = tile.solid(); for(int i = 0; i < 4; i++){ Tile other = tile.nearby(i); @@ -120,9 +120,9 @@ public class Pathfinder implements Runnable{ } return PathTile.get( - tile.build == null || !tile.solid() || tile.block() instanceof CoreBlock ? 0 : Math.min((int)(tile.build.health / 40), 80), + tile.build == null || !solid || tile.block() instanceof CoreBlock ? 0 : Math.min((int)(tile.build.health / 40), 80), tile.getTeamID(), - tile.solid(), + solid, tile.floor().isLiquid, tile.staticDarkness() >= 2 || (tile.floor().solid && tile.block() == Blocks.air), nearLiquid, diff --git a/core/src/mindustry/entities/units/AIController.java b/core/src/mindustry/entities/units/AIController.java index 745a90171b..9aaac0a4e0 100644 --- a/core/src/mindustry/entities/units/AIController.java +++ b/core/src/mindustry/entities/units/AIController.java @@ -90,7 +90,7 @@ public class AIController implements UnitController{ if(tile == targetTile || (costType == Pathfinder.costNaval && !targetTile.floor().isLiquid)) return; - unit.moveAt(vec.trns(unit.angleTo(targetTile), unit.speed())); + unit.moveAt(vec.trns(unit.angleTo(targetTile.worldx(), targetTile.worldy()), unit.speed())); } protected void updateWeapons(){