Merge pull request #4275 from IllianiCBT/turnover_originaUnitPayoutBug

Fixed Original Unit Value Being Deducted from Payout Sum When Personnel Resign/Retire
MegaMek · Jun 23, 2024 · 705635c · 705635c
2 parents f76d2f2 + 1d7188e
commit 705635c
Showing 1 changed file with 4 additions and 19 deletions.
diff --git a/MekHQ/src/mekhq/gui/dialog/RetirementDefectionDialog.java b/MekHQ/src/mekhq/gui/dialog/RetirementDefectionDialog.java
@@ -636,25 +636,10 @@ public Money totalPayout() {
             /* If no unit is required as part of the payout, the unit is part or all of the
              * final payout.
              */
-            if ((rdTracker.getPayout(id).getWeightClass() == 0 &&
-                    null != unitAssignments.get(id) &&
-                            null != hqView.getCampaign().getUnit(unitAssignments.get(id)))) {
-                payout = payout.minus(hqView.getCampaign().getUnit(unitAssignments.get(id)).getBuyCost());
-            } else if ((hqView.getCampaign().getCampaignOptions().isUseShareSystem()
-                    && hqView.getCampaign().getCampaignOptions().isTrackOriginalUnit()
-                    && Objects.equals(hqView.getCampaign().getPerson(id).getOriginalUnitId(), unitAssignments.get(id)))
-                    && hqView.getCampaign().getUnit(unitAssignments.get(id)) != null) {
-                payout = payout.minus(hqView.getCampaign().getUnit(unitAssignments.get(id)).getBuyCost());
-            }
-
-            /*  If using the share system and tracking the original unit,
-             * the payout is also reduced by the value of the unit.
-             */
-            if (hqView.getCampaign().getCampaignOptions().isUseShareSystem()
-                    && hqView.getCampaign().getCampaignOptions().isTrackOriginalUnit()
-                    && Objects.equals(hqView.getCampaign().getPerson(id).getOriginalUnitId(), unitAssignments.get(id))
-                    && hqView.getCampaign().getUnit(unitAssignments.get(id)) != null) {
-                payout = payout.minus(hqView.getCampaign().getUnit(unitAssignments.get(id)).getBuyCost());
+            if ((rdTracker.getPayout(id).getWeightClass() == 0)
+                    && (unitAssignments.get(id) != null)
+                    && (hqView.getCampaign().getUnit(unitAssignments.get(id)) != null)) {
+                payout = payout.minus(hqView.getCampaign().getUnit(unitAssignments.get(id)).getSellValue());
             }
 
             // If the person is still under contract, we don't care that they're owed a unit