diff --git a/client/src/main/java/ru/trader/controllers/PowerPlayController.java b/client/src/main/java/ru/trader/controllers/PowerPlayController.java index b264af4..a2122be 100644 --- a/client/src/main/java/ru/trader/controllers/PowerPlayController.java +++ b/client/src/main/java/ru/trader/controllers/PowerPlayController.java @@ -210,7 +210,7 @@ public class PowerPlayController { if (hq == null || entry.getPowerState().isContested() || entry.getPower() != hq.getPower()) { contested += cc; } - if (hq != null && entry.getPowerState().isExploited() && entry.getPower() == hq.getPower()) { + if (hq != null && (entry.getPowerState().isExploited() || entry.getPowerState().isBlocked()) && entry.getPower() == hq.getPower()) { intersected += cc; } Set powers = entry.getControllingSystems().stream().map(Place::getPower).collect(Collectors.toSet()); diff --git a/core/src/main/java/ru/trader/analysis/PowerPlayAnalyzator.java b/core/src/main/java/ru/trader/analysis/PowerPlayAnalyzator.java index a80d2d0..fbc3a0a 100644 --- a/core/src/main/java/ru/trader/analysis/PowerPlayAnalyzator.java +++ b/core/src/main/java/ru/trader/analysis/PowerPlayAnalyzator.java @@ -173,7 +173,7 @@ public class PowerPlayAnalyzator { public static Stream getNearExpansions(Stream starSystems, Collection centers, double maxDistance){ IntersectsMapper mapper = new IntersectsMapper(centers, maxDistance, false, true); return starSystems.filter(new FarDropper(centers, maxDistance)) - .filter(p -> p.getPowerState() == POWER_STATE.EXPANSION) + .filter(p -> p.getPowerState().isExpansion()) .map(mapper) .sorted(new DistanceComparator()); } diff --git a/core/src/main/java/ru/trader/core/POWER_STATE.java b/core/src/main/java/ru/trader/core/POWER_STATE.java index 04caf69..d1ba5b0 100644 --- a/core/src/main/java/ru/trader/core/POWER_STATE.java +++ b/core/src/main/java/ru/trader/core/POWER_STATE.java @@ -18,4 +18,5 @@ public enum POWER_STATE { public boolean isContested(){ return this == CONTESTED; } + public boolean isBlocked() { return this == BLOCKED;} }