Mekish Merge Conflicts

MegaMek · Sep 14, 2024 · c39c5b6 · c39c5b6
1 parent 721d42e
commit c39c5b6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/megameklab/src/megameklab/printing/PrintMek.java b/megameklab/src/megameklab/printing/PrintMek.java
@@ -374,7 +374,7 @@ protected void drawArmorStructurePips() {
 
             if ((null != element) && !frontComplete) {
                 ArmorPipLayout.addPips(this, element, mek.getOArmor(loc),
-                        PipType.forAT(mech.getArmorType(loc)), alternateMethod);
+                        PipType.forAT(mek.getArmorType(loc)), alternateMethod);
 
             }
             if ((loc > Mek.LOC_HEAD) && !structComplete) {
@@ -391,7 +391,7 @@ protected void drawArmorStructurePips() {
                 element = getElementById(ARMOR_PIPS + mek.getLocationAbbr(loc) + "R");
                 if (null != element) {
                     ArmorPipLayout.addPips(this, element, mek.getOArmor(loc, true),
-                            PipType.forAT(mech.getArmorType(loc)), alternateMethod);
+                            PipType.forAT(mek.getArmorType(loc)), alternateMethod);
 
                 }
             }