From 0b2466f7de2e1f6581b96facb7692dafe31b6894 Mon Sep 17 00:00:00 2001
From: Simon <juliez@outlook.de>
Date: Sun, 22 Sep 2024 14:53:28 +0200
Subject: [PATCH] fix personal merge error

---
 megamek/src/megamek/common/weapons/ACCaselessHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/megamek/src/megamek/common/weapons/ACCaselessHandler.java b/megamek/src/megamek/common/weapons/ACCaselessHandler.java
index c552a8e4499..f969f58357f 100644
--- a/megamek/src/megamek/common/weapons/ACCaselessHandler.java
+++ b/megamek/src/megamek/common/weapons/ACCaselessHandler.java
@@ -43,7 +43,7 @@ protected boolean doChecks(Vector<Report> vPhaseReport) {
             return true;
         }
 
-        if ((roll.getIntValue() <= 2) && !(ae instanceof Infantry)) {
+        if ((roll.getIntValue() <= 2) && !ae.isConventionalInfantry()) {
             Roll diceRoll = Compute.rollD6(2);
 
             Report r = new Report(3164);