Merge pull request #4822 from IllianiCBT/unitAssignment_conventionalF…

…ighters Removed Ability to Assign AeroSpace Pilots to Conventional Aircraft
MegaMek · Sep 13, 2024 · f2c597f · f2c597f
2 parents fa24973 + 194a17f
commit f2c597f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/MekHQ/src/mekhq/campaign/personnel/enums/PersonnelRole.java b/MekHQ/src/mekhq/campaign/personnel/enums/PersonnelRole.java
@@ -253,7 +253,7 @@ public boolean isAerospaceGrouping() {
     }
 
     public boolean isConventionalAirGrouping() {
-        return isAerospaceGrouping() || isConventionalAircraftPilot();
+        return isConventionalAircraftPilot();
     }
 
     public boolean isGroundVehicleCrew() {

diff --git a/MekHQ/unittests/mekhq/campaign/personnel/enums/PersonnelRoleTest.java b/MekHQ/unittests/mekhq/campaign/personnel/enums/PersonnelRoleTest.java
@@ -447,9 +447,7 @@ void testIsAerospaceGrouping() {
     @Test
     void testIsConventionalAirGrouping() {
         for (final PersonnelRole personnelRole : roles) {
-            if ((personnelRole == PersonnelRole.LAM_PILOT)
-                    || (personnelRole == PersonnelRole.AEROSPACE_PILOT)
-                    || (personnelRole == PersonnelRole.CONVENTIONAL_AIRCRAFT_PILOT)) {
+            if (personnelRole == PersonnelRole.CONVENTIONAL_AIRCRAFT_PILOT) {
                 assertTrue(personnelRole.isConventionalAirGrouping());
             } else {
                 assertFalse(personnelRole.isConventionalAirGrouping());