Issue #8670: Don't resetPilotAndEntity when setting the temp crew if the campaign is null

psikomonkie · psikomonkie · commit dda84f6b0b06 · 2026-01-13T16:12:32.000-05:00
diff --git a/MekHQ/src/mekhq/campaign/unit/Unit.java b/MekHQ/src/mekhq/campaign/unit/Unit.java
@@ -6475,8 +6475,12 @@ public void setTempCrew(PersonnelRole personnelRole, int count) {
         } else {
             tempPersonnelRoleMap.put(personnelRole, count);
         }
-        resetPilotAndEntity();
-        MekHQ.triggerEvent(new UnitChangedEvent(this));
+
+        if (getCampaign() != null) {
+            resetPilotAndEntity();
+            MekHQ.triggerEvent(new UnitChangedEvent(this));
+        }
+
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -6475,8 +6475,12 @@ public void setTempCrew(PersonnelRole personnelRole, int count) {`
`6475`	`6475`	`} else {`
`6476`	`6476`	`tempPersonnelRoleMap.put(personnelRole, count);`
`6477`	`6477`	`}`
`6478`		`- resetPilotAndEntity();`
`6479`		`- MekHQ.triggerEvent(new UnitChangedEvent(this));`
	`6478`	`+`
	`6479`	`+ if (getCampaign() != null) {`
	`6480`	`+ resetPilotAndEntity();`
	`6481`	`+ MekHQ.triggerEvent(new UnitChangedEvent(this));`
	`6482`	`+ }`
	`6483`	`+`
`6480`	`6484`	`}`
`6481`	`6485`
`6482`	`6486`	`/**`