Merging changes from private branch

2025-04-04 11:47:35 -04:00
parent cf5c6d0905
commit b7dbe54d76
161 changed files with 2484 additions and 1137 deletions
--- a/core/src/mindustry/world/Edges.java
+++ b/core/src/mindustry/world/Edges.java
@@ -50,7 +50,7 @@ public class Edges{
    }

    public static Tile getFacingEdge(Building tile, Building other){
-        Tile res = getFacingEdge(tile.block, tile.tileX(), tile.tileY(), other.tile());
+        Tile res = getFacingEdge(tile.block, tile.tileX(), tile.tileY(), other.tile);
        return res == null ? tile.tile : res;
    }