Merge pull request #6008 from MegaMek/testproto-slot-counting-fix

Fix slot counting validation for PM
MegaMek · Sep 16, 2024 · 803a80a · 803a80a
2 parents 14184a4 + 9304ef4
commit 803a80a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/megamek/src/megamek/common/verifier/TestProtoMek.java b/megamek/src/megamek/common/verifier/TestProtoMek.java
@@ -276,7 +276,8 @@ public boolean hasIllegalEquipmentCombinations(StringBuffer buff) {
  Map<Integer, Double> weightByLoc = new HashMap<>();
  int meleeWeapons = 0;
  for (Mounted<?> mount : proto.getEquipment()) {
- if (!requiresSlot(mount.getType())) {
+ if (!requiresSlot(mount.getType()) || (mount.getType() instanceof ArmorType)) {
+ // armor is added separately
  continue;
  }
  slotsByLoc.merge(mount.getLocation(), 1, Integer::sum);