Merge pull request #2230 from sixlettervariables/issue-2166-battlearm…

…orsuit-null-stickerprice Issue #2166: NRE in Money::plus/Money::minus
MegaMek · Nov 15, 2020 · 2eec7ae · 2eec7ae
2 parents 9714fa3 + 29b7860
commit 2eec7ae
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/MekHQ/src/mekhq/campaign/finances/Money.java b/MekHQ/src/mekhq/campaign/finances/Money.java
@@ -102,6 +102,10 @@ public Money absolute() {
     }
 
     public Money plus(Money amount) {
+        if (amount == null) {
+            return plus(0L);
+        }
+
         return new Money(getWrapped().plus(amount.getWrapped()));
     }
 
@@ -114,6 +118,10 @@ public Money plus(List<Money> amounts) {
     }
 
     public Money minus(Money amount) {
+        if (amount == null) {
+            return minus(0L);
+        }
+
         return new Money(getWrapped().minus(amount.getWrapped()));
     }
 

diff --git a/MekHQ/src/mekhq/campaign/parts/BattleArmorSuit.java b/MekHQ/src/mekhq/campaign/parts/BattleArmorSuit.java
@@ -235,7 +235,7 @@ public Money getStickerPrice() {
         //if there are no linked parts and the unit is null,
         //then use the pre-recorded alternate costs
         if ((null == unit) && !hasChildParts()) {
-            return alternateCost;
+            return (alternateCost != null) ? alternateCost : Money.zero();
         }
         Money cost = Money.zero();
         switch(weightClass) {