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.

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 Intersected Conditions in CustomizePersonDialog.java #4201

Merged
merged 1 commit into from
Jun 15, 2024

Conversation

IllianiCBT
Copy link
Collaborator

This PR addresses a situation where a couple of lines got intersected (probably during merge) in our code to customizing personnel (the edit person dialogue). This caused the setting of fatigue and the saving of any other changes to be reliant on the null == choiceOriginalUnit.getSelectedItem() conditional being true.

- Removed unnecessary nested condition on choiceOriginalUnit selection
- Set fatigue regardless of unit selection
- Fixed setting of person's original unit properties and visibility status
@IllianiCBT IllianiCBT self-assigned this Jun 10, 2024
@IllianiCBT IllianiCBT added the Bug label Jun 10, 2024
@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 0% with 11 lines in your changes missing coverage. Please review.

Project coverage is 10.28%. Comparing base (8491c48) to head (eb77840).
Report is 73 commits behind head on master.

Files Patch % Lines
...HQ/src/mekhq/gui/dialog/CustomizePersonDialog.java 0.00% 11 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##             master    #4201      +/-   ##
============================================
- Coverage     10.28%   10.28%   -0.01%     
- Complexity     5816     5822       +6     
============================================
  Files           921      922       +1     
  Lines        125827   126068     +241     
  Branches      18603    18636      +33     
============================================
+ Hits          12944    12963      +19     
- Misses       111613   111834     +221     
- Partials       1270     1271       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@HammerGS HammerGS merged commit f3ee104 into MegaMek:master Jun 15, 2024
4 checks passed
HammerGS added a commit that referenced this pull request Jun 15, 2024
+ Fix #4203: Fixed Monthly Unit Market Incorrectly Filtering Out Vehicles
+ PR #4205: Fixed bug in Company Generator, add word Dragoon in front of Dragoon rating.
+ PR #4202: Added Parsing for "campaignStartDate" on Campaign Load
+ PR #4201: Fixed Intersected Conditions in CustomizePersonDialog.java
+ PR #4199: Updated PersonnelTableMouseAdapter to Support Enrolling Multiple Personnel
+ PR #4197: Updated Default Support Personnel Counts in Company Generator
+ Fix 2405: Added Variable Unit Quality to Salvaged Units
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants