Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2025-07-05 18:06:54 -04:00
2 changed files with 6 additions and 1 deletions

View File

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

View File

@@ -379,6 +379,11 @@ public class Floor extends Block{
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 Tile tile;
public Floor floor;