Merge branch 'master' of https://github.com/MegaMek/megamek.git

MegaMek · Aug 7, 2020 · ebd059b · ebd059b
2 parents 77b06b7 + aba2757
commit ebd059b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/megamek/src/megamek/common/templates/BattleArmorTROView.java b/megamek/src/megamek/common/templates/BattleArmorTROView.java
@@ -145,7 +145,8 @@ private int addBAEquipment() {
         Map<String, Object> row;
         int nameWidth = 30;
         for (final Mounted m : ba.getEquipment()) {
-            if (m.isAPMMounted() || (m.getType() instanceof InfantryAttack) || (m.getType() == armor)) {
+            if (m.isAPMMounted() || (m.getType() instanceof InfantryAttack)
+                    || (m.getType() == armor) || (m.getLocation() == BattleArmor.LOC_NONE)) {
                 continue;
             }
             if ((m.getType() instanceof MiscType) && m.getType().hasFlag(MiscType.F_BA_MANIPULATOR)) {