Merge pull request #6531 from SJuliez/legacy-inf-load

MML #1721: legacy infantry blk files
MegaMek · Feb 11, 2025 · 632b0fd · 632b0fd
2 parents a4aff92 + 8b4337b
commit 632b0fd
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/megamek/src/megamek/common/loaders/BLKInfantryFile.java b/megamek/src/megamek/common/loaders/BLKInfantryFile.java
@@ -71,7 +71,8 @@ public Entity getEntity() throws EntityLoadingException {
         }
 
         // get primary and secondary weapons
-        if (dataFile.exists("secondn")) {
+        // the check for "secondary" is for legacy infantry files that have a <secondn> block but no actual secondary weapon
+        if (dataFile.exists("secondn") && dataFile.exists("Secondary")) {
             infantry.setSecondaryWeaponsPerSquad(dataFile.getDataAsInt("secondn")[0]);
         }