Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

This commit is contained in:
Anuken
2021-08-20 11:10:55 -04:00
4 changed files with 11 additions and 5 deletions

View File

@@ -31,7 +31,7 @@ public class SpawnPathFilter extends GenerateFilter{
@Override
public void apply(Tiles tiles, GenerateInput in){
Tile core = null;
var cores = new Seq<Tile>();
var spawns = new Seq<Tile>();
for(Tile tile : tiles){
@@ -39,11 +39,11 @@ public class SpawnPathFilter extends GenerateFilter{
spawns.add(tile);
}
if(tile.block() instanceof CoreBlock && tile.team() != Vars.state.rules.waveTeam){
core = tile;
cores.add(tile);
}
}
if(core != null && spawns.any()){
for(var core : cores){
for(var spawn : spawns){
var path = Astar.pathfind(core.x, core.y, spawn.x, spawn.y, t -> t.solid() ? 100 : 1, Astar.manhattan, tile -> !tile.floor().isDeep());
for(var tile : path){