From ffb22b0709b3dc9aac67a739924a4a73275d2166 Mon Sep 17 00:00:00 2001 From: Eric Gruetzmacher Date: Sat, 18 Sep 2021 23:22:10 -0500 Subject: [PATCH 1/2] Fixed #2878 Missing Bay Door on reload. --- MekHQ/src/mekhq/campaign/parts/MissingBayDoor.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/MekHQ/src/mekhq/campaign/parts/MissingBayDoor.java b/MekHQ/src/mekhq/campaign/parts/MissingBayDoor.java index aa630b28d4..c5b28587a5 100644 --- a/MekHQ/src/mekhq/campaign/parts/MissingBayDoor.java +++ b/MekHQ/src/mekhq/campaign/parts/MissingBayDoor.java @@ -72,10 +72,15 @@ public void fix() { unit.addPart(actualReplacement); campaign.getQuartermaster().addPart(actualReplacement, 0); replacement.decrementQuantity(); + + // Calling 'remove()' has the side effect of setting this.parentPart to null. + // Issue #2878 + Part _parentPart = parentPart; remove(false); - if (null != parentPart) { - parentPart.addChildPart(actualReplacement); - parentPart.updateConditionFromPart(); + + if (null != _parentPart) { + _parentPart.addChildPart(actualReplacement); + _parentPart.updateConditionFromPart(); } } } From 34f540f8d81b7fb354e8aa385c725d49ea35eca4 Mon Sep 17 00:00:00 2001 From: Eric Gruetzmacher Date: Sun, 19 Sep 2021 21:59:06 -0500 Subject: [PATCH 2/2] Missing Bay Door review changes (#2878) --- MekHQ/src/mekhq/campaign/parts/MissingBayDoor.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/MekHQ/src/mekhq/campaign/parts/MissingBayDoor.java b/MekHQ/src/mekhq/campaign/parts/MissingBayDoor.java index c5b28587a5..ba14b62210 100644 --- a/MekHQ/src/mekhq/campaign/parts/MissingBayDoor.java +++ b/MekHQ/src/mekhq/campaign/parts/MissingBayDoor.java @@ -74,13 +74,13 @@ public void fix() { replacement.decrementQuantity(); // Calling 'remove()' has the side effect of setting this.parentPart to null. - // Issue #2878 - Part _parentPart = parentPart; + // Issue #2878 - Missing Bay Door on reload. + Part parentReference = parentPart; remove(false); - if (null != _parentPart) { - _parentPart.addChildPart(actualReplacement); - _parentPart.updateConditionFromPart(); + if (null != parentReference) { + parentReference.addChildPart(actualReplacement); + parentReference.updateConditionFromPart(); } } }