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

Conflicts: core/src/mindustry/ui/dialogs/PlanetDialog.java
2021-08-18 15:04:30 -04:00
parent 2200a44653 512b65a592
commit f3cacb9e99
86 changed files with 942 additions and 740 deletions
@@ -151,7 +151,7 @@ public class Build{
                if(closest != null && closest.team != team){
                    return false;
                }
-            }else if(state.teams.eachEnemyCore(team, core -> Mathf.dst(x * tilesize + type.offset, y * tilesize + type.offset, core.x, core.y) < state.rules.enemyCoreBuildRadius + type.size * tilesize / 2f)){
+            }else if(state.teams.anyEnemyCoresWithin(team, x * tilesize + type.offset, y * tilesize + type.offset, state.rules.enemyCoreBuildRadius + tilesize)){
                return false;
            }
        }