Merge pull request #5307 from IllianiCBT/autoAwards_theatreOfWarBug

Fixed Theatre of War Faction Checks
MegaMek · Dec 12, 2024 · f4aecc8 · f4aecc8
2 parents f17a228 + be8f60f
commit f4aecc8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/MekHQ/src/mekhq/campaign/personnel/autoAwards/TheatreOfWarAwards.java b/MekHQ/src/mekhq/campaign/personnel/autoAwards/TheatreOfWarAwards.java
@@ -52,7 +52,13 @@ public static Map<Integer, List<Object>> TheatreOfWarAwardsProcessor(Campaign ca
         boolean isEligible;
         List<Award> eligibleAwards = new ArrayList<>();
 
-        String employer = ((Contract) mission).getEmployer();
+        // if the mission isn't an instance of 'AtBContract' we won't have the information we need,
+        // so abort processing.
+        if (!(mission instanceof AtBContract)) {
+            return AutoAwardsController.prepareAwardData(person, eligibleAwards);
+        }
+
+        String employer = ((AtBContract) mission).getEmployerCode();
 
         int contractStartYear = ((Contract) mission).getStartDate().getYear();
         int currentYear = campaign.getGameYear();
@@ -103,10 +109,10 @@ public static Map<Integer, List<Object>> TheatreOfWarAwardsProcessor(Campaign ca
                 }
 
                 if (belligerents.size() == 1) {
-                    if (!processFaction(belligerents.get(0), employer)) {
+                    if (!processFaction(employer, belligerents.get(0))) {
                         continue;
                     }
-                } else if ((campaign.getCampaignOptions().isUseAtB()) && (mission instanceof AtBContract)) {
+                } else if (campaign.getCampaignOptions().isUseAtB()) {
                     String enemy = ((AtBContract) mission).getEnemyCode();
 
                     if (hasLoyalty(employer, attackers)) {

diff --git a/MekHQ/src/mekhq/gui/dialog/AutoAwardsDialog.java b/MekHQ/src/mekhq/gui/dialog/AutoAwardsDialog.java
@@ -145,7 +145,7 @@ private void initComponents() {
         AutoAwardsTableModel model = new AutoAwardsTableModel(campaign);
         // This is where we insert the external data
         logger.info("Trying to pass data to AutoAwardsTableModel.java");
-        logger.info("Data being passed: {}", data);
+        logger.debug("Data being passed: {}", data);
         model.setData(data);
         logger.info("Attempt successful");
         personnelTable = new AutoAwardsTable(model);

diff --git a/MekHQ/src/mekhq/gui/model/AutoAwardsTableModel.java b/MekHQ/src/mekhq/gui/model/AutoAwardsTableModel.java
@@ -61,11 +61,11 @@ public void setData(Map<Integer, List<Object>> map) {
         if (map.isEmpty()) {
             logger.error("AutoAwardsDialog failed to pass 'data' into AutoAwardsTableModel");
         } else {
-            logger.info("AutoAwardsDialog passed 'data' into AutoAwardsTableModel: {}", map);
+            logger.debug("AutoAwardsDialog passed 'data' into AutoAwardsTableModel: {}", map);
         }
 
         data = map;
-        logger.info("Translated data: {}", data);
+        logger.debug("Translated data: {}", data);
     }
 
     @Override