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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2025-07-05 18:06:54 -04:00
parent 3d3507dec9 d1b4158285
commit 21ef30531a
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ai/Pathfinder.java
View File

@@ -253,7 +253,7 @@ public class Pathfinder implements Runnable{
nearSolid, nearSolid,
nearLegSolid, nearLegSolid,
tile.floor().isDeep(), tile.floor().isDeep(),
tile.floor().damageTaken > 0.00001f, tile.floor().damages(),
allDeep, allDeep,
nearDeep, nearDeep,
tile.block().teamPassable tile.block().teamPassable

5
core/src/mindustry/world/blocks/environment/Floor.java
View File

@@ -379,6 +379,11 @@ public class Floor extends Block{
return (other.realBlendId(otherTile) > realBlendId(tile) || edges(tile.x, tile.y) == null); return (other.realBlendId(otherTile) > realBlendId(tile) || edges(tile.x, tile.y) == null);
} }
/** @return whether being on this floor can damage a unit */
public boolean damages(){
return damageTaken > 0f || (status != null && status.damage > 0f);
}
public static class UpdateRenderState{ public static class UpdateRenderState{
public Tile tile; public Tile tile;
public Floor floor; public Floor floor;