From af76e889cf1e47b48730f5f9bcb9835ed455a651 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 7 Jun 2023 09:52:50 -0400 Subject: [PATCH] Closes Anuken/Mindustry-Suggestions/issues/4452 --- core/src/mindustry/game/Universe.java | 2 +- core/src/mindustry/type/Sector.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/game/Universe.java b/core/src/mindustry/game/Universe.java index a1c8951db6..4aa77d8be7 100644 --- a/core/src/mindustry/game/Universe.java +++ b/core/src/mindustry/game/Universe.java @@ -253,7 +253,7 @@ public class Universe{ //queue random invasions if(!sector.isAttacked() && sector.planet.allowSectorInvasion && sector.info.minutesCaptured > invasionGracePeriod && sector.info.hasSpawns){ - int count = sector.near().count(Sector::hasEnemyBase); + int count = sector.near().count(s -> s.hasEnemyBase() && !s.hasBase()); //invasion chance depends on # of nearby bases if(count > 0 && Mathf.chance(baseInvasionChance * (0.8f + (count - 1) * 0.3f))){ diff --git a/core/src/mindustry/type/Sector.java b/core/src/mindustry/type/Sector.java index b4bb3006ac..921802e389 100644 --- a/core/src/mindustry/type/Sector.java +++ b/core/src/mindustry/type/Sector.java @@ -121,7 +121,7 @@ public class Sector{ return save != null && (info.waves || info.attack) && info.hasCore; } - /** @return whether the player has a base here. */ + /** @return whether the player has a base (active save with a core) here. */ public boolean hasBase(){ return save != null && info.hasCore && !(Vars.state.isGame() && Vars.state.rules.sector == this && state.gameOver); }