From c62da4c98cd88fe16ee40f85afd86dfac355054b Mon Sep 17 00:00:00 2001
From: algebro <algebro@tuta.io>
Date: Mon, 19 Aug 2024 13:53:03 -0400
Subject: [PATCH 1/2] camops contract market: don't generate personnel without
 roles on a 7

---
 .../campaign/market/PersonnelMarketCampaignOps.java   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/MekHQ/src/mekhq/campaign/market/PersonnelMarketCampaignOps.java b/MekHQ/src/mekhq/campaign/market/PersonnelMarketCampaignOps.java
index 8c220d8935..41b6392b87 100644
--- a/MekHQ/src/mekhq/campaign/market/PersonnelMarketCampaignOps.java
+++ b/MekHQ/src/mekhq/campaign/market/PersonnelMarketCampaignOps.java
@@ -33,7 +33,7 @@
 import mekhq.module.api.PersonnelMarketMethod;
 
 /**
- * Method for personnel market generation given in the repair and maintenance section of Strategic Operations
+ * Method for personnel market generation given in the replacement personnel section of Campaign Operations
  */
 public class PersonnelMarketCampaignOps implements PersonnelMarketMethod {
     private int daysSinceRolled = 0;
@@ -49,7 +49,7 @@ public List<Person> generatePersonnelForDay(Campaign c) {
             final List<PersonnelRole> techRoles = PersonnelRole.getTechRoles();
             final List<PersonnelRole> vesselRoles = PersonnelRole.getVesselRoles();
 
-            Person p;
+            Person p = null;
             int roll = Compute.d6(2);
             if (roll == 2) { // Medical
                 p = c.newPerson(PersonnelRole.DOCTOR);
@@ -71,11 +71,12 @@ public List<Person> generatePersonnelForDay(Campaign c) {
                 p = c.newPerson(techRoles.get(Compute.randomInt(techRoles.size())));
             } else if (roll == 12) { // Vessel Crew
                 p = c.newPerson(vesselRoles.get(Compute.randomInt(vesselRoles.size())));
-            } else {
-                p = c.newPerson(PersonnelRole.NONE);
             }
             daysSinceRolled = 0;
-            return Collections.singletonList(p);
+            if (p != null)  {
+                return Collections.singletonList(p);
+            }
+            return null;
         } else {
             daysSinceRolled++;
             return null;

From 204adbbad4d22459c38d4b1dad223cde24a17000 Mon Sep 17 00:00:00 2001
From: algebro <algebro@tuta.io>
Date: Tue, 20 Aug 2024 10:11:48 -0400
Subject: [PATCH 2/2] remove redundant return statement

---
 .../src/mekhq/campaign/market/PersonnelMarketCampaignOps.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/MekHQ/src/mekhq/campaign/market/PersonnelMarketCampaignOps.java b/MekHQ/src/mekhq/campaign/market/PersonnelMarketCampaignOps.java
index 41b6392b87..e3a64a659d 100644
--- a/MekHQ/src/mekhq/campaign/market/PersonnelMarketCampaignOps.java
+++ b/MekHQ/src/mekhq/campaign/market/PersonnelMarketCampaignOps.java
@@ -76,11 +76,10 @@ public List<Person> generatePersonnelForDay(Campaign c) {
             if (p != null)  {
                 return Collections.singletonList(p);
             }
-            return null;
         } else {
             daysSinceRolled++;
-            return null;
         }
+        return null;
     }
 
     @Override