Merge branch 'Sharlottes:master' into master

This commit is contained in:
Parkurist
2021-08-15 16:37:06 +03:00
committed by GitHub

View File

@@ -84,9 +84,9 @@ public class Main extends Mod {
spawner.getSpawns().each(t -> { spawner.getSpawns().each(t -> {
Team enemyTeam = state.rules.waveTeam; Team enemyTeam = state.rules.waveTeam;
for (int p = 0; p < 3; p++) { for (int p = 0; p < 3; p++) {
if(p == 0 && !groundValid) continue; if(p == 0 && !groundValid && !mobile) continue;
if(p == 1 && !legValid) continue; if(p == 1 && !legValid && !mobile) continue;
if(p == 2 && !navalValid) continue; if(p == 2 && !navalValid && !mobile) continue;
otherCores = Groups.build.count(b -> b instanceof CoreBlock.CoreBuild && b.team != enemyTeam); otherCores = Groups.build.count(b -> b instanceof CoreBlock.CoreBuild && b.team != enemyTeam);
getNextTile(t, p); getNextTile(t, p);