Merge pull request #8341 from IllianiBird/doctorRemoval

Fix #8340: Explicitly Remove Personnel From Doctor Assignment When Removing from Campaign

Author: HammerGS

MekHQ/src/mekhq/campaign/Campaign.java

@@ -5441,6 +5441,7 @@ public void removePerson(final @Nullable Person person, final boolean log) {
         if (unit != null) {
             unit.remove(person, true);
         }
+        person.setDoctorId(null, 0);
         removeAllPatientsFor(person);
         person.removeAllTechJobs(this);
         removeKillsFor(person.getId());

MekHQ/src/mekhq/campaign/randomEvents/prisoners/PrisonerMissionEndEvent.java

@@ -310,11 +310,13 @@ Money getRansom(List<Person> alliedPoWs) {
     private void processPlayerResponse(Money ransom, boolean isGoodEvent, int choiceIndex, List<Person> prisoners) {
         if (choiceIndex == CHOICE_RELEASE_THEM) {
             removeAllPrisoners(prisoners);
+            return;
         }
 
         if (choiceIndex == CHOICE_EXECUTE_THEM) {
-            removeAllPrisoners(prisoners);
             executePrisoners(prisoners);
+            removeAllPrisoners(prisoners);
+            return;
         }
 
         final LocalDate today = campaign.getLocalDate();