Merge pull request #4542 from IllianiCBT/education_massEnrollNPE

Fixed NPE in Mass Enroll Filters
MegaMek · Aug 7, 2024 · 877bcd9 · 877bcd9
2 parents 76e9cea + 1b488c6
commit 877bcd9
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java b/MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java
@@ -3007,8 +3007,13 @@ private void buildEducationMenusMassEnroll(Campaign campaign, List<Person> perso
                 // find the first faction that accepts applications from all persons in personnel
                 Optional<String> suitableFaction = personnel.stream()
                         .map(person -> academy.getFilteredFaction(campaign, person, campaign.getCurrentSystem().getFactions(campaign.getLocalDate())))
-                        .filter(faction -> personnel.stream().allMatch(person -> faction.equals(academy.getFilteredFaction(campaign, person, campaign.getCurrentSystem().getFactions(campaign.getLocalDate())))))
+                        .filter(faction -> personnel.stream().allMatch(person ->
+                                Objects.equals(
+                                        faction,
+                                        academy.getFilteredFaction(campaign, person, campaign.getCurrentSystem().getFactions(campaign.getLocalDate()))
+                                )))
                         .distinct()
+                        .filter(Objects::nonNull)
                         .findFirst();
 
                 if (suitableFaction.isPresent()) {