Merge 5b548ce into 3c8a806

MegaMek · Jan 8, 2021 · 8b90434 · 8b90434
2 parents 3c8a806 + 5b548ce
commit 8b90434
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/MekHQ/src/mekhq/campaign/universe/RangedFactionSelector.java b/MekHQ/src/mekhq/campaign/universe/RangedFactionSelector.java
@@ -145,8 +145,13 @@ private void createLookupMap(Campaign campaign) {
             // to affect the 'spread'.
             double delta = Math.log10(pop) / (1 + distance * distanceScale);
             for (Faction faction : planetarySystem.getFactionSet(now)) {
-                if (faction.is(Tag.ABANDONED) || faction.is(Tag.HIDDEN) || faction.is(Tag.INACTIVE)
-                    || faction.is(Tag.MERC)) {
+                if (faction.is(Tag.ABANDONED) || faction.is(Tag.HIDDEN) || faction.is(Tag.SPECIAL)
+                        || faction.is(Tag.MERC)) {
+                    continue;
+                }
+
+                if (faction.is(Tag.INACTIVE) && !faction.isComStar()) {
+                    // Skip INACTIVE factions [excepting ComStar]
                     continue;
                 }