Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed Personnel Filter Role Checks to For Vehicle and Vessel Crews #4939

Merged
merged 1 commit into from
Oct 2, 2024
Merged

Fixed Personnel Filter Role Checks to For Vehicle and Vessel Crews #4939

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions MekHQ/src/mekhq/gui/enums/PersonnelFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,9 +400,9 @@ public boolean getFilteredInformation(final Person person, LocalDate currentDate
active && (MekHQ.getMHQOptions().getPersonnelFilterOnPrimaryRole() ?
person.getPrimaryRole().isLAMPilot() : person.hasRole(PersonnelRole.LAM_PILOT));
case VEHICLE_CREWMEMBER ->
active && (MekHQ.getMHQOptions().getPersonnelFilterOnPrimaryRole() ?
person.getPrimaryRole().isVehicleCrew() :
(person.getPrimaryRole().isVehicleCrew() || person.getSecondaryRole().isVehicleCrew()));
active && (MekHQ.getMHQOptions().getPersonnelFilterOnPrimaryRole() ?
person.getPrimaryRole().isVehicleCrewMember() :
(person.getPrimaryRole().isVehicleCrewMember() || person.getSecondaryRole().isVehicleCrewMember()));
case GROUND_VEHICLE_DRIVER ->
active && (MekHQ.getMHQOptions().getPersonnelFilterOnPrimaryRole() ?
person.getPrimaryRole().isGroundVehicleDriver() : person.hasRole(PersonnelRole.GROUND_VEHICLE_DRIVER));
Expand Down Expand Up @@ -435,8 +435,8 @@ public boolean getFilteredInformation(final Person person, LocalDate currentDate
person.getPrimaryRole().isSoldier() : person.hasRole(PersonnelRole.SOLDIER));
case VESSEL_CREWMEMBER ->
active && (MekHQ.getMHQOptions().getPersonnelFilterOnPrimaryRole() ?
person.getPrimaryRole().isVesselCrew() :
(person.getPrimaryRole().isVesselCrew() || person.getSecondaryRole().isVesselCrew()));
person.getPrimaryRole().isVesselCrewMember() :
(person.getPrimaryRole().isVesselCrewMember() || person.getSecondaryRole().isVesselCrewMember()));
case VESSEL_PILOT ->
active && (MekHQ.getMHQOptions().getPersonnelFilterOnPrimaryRole() ?
person.getPrimaryRole().isVesselPilot() : person.hasRole(PersonnelRole.VESSEL_PILOT));
Expand Down