diff --git a/src/main/java/forge/card/trigger/Trigger.java b/src/main/java/forge/card/trigger/Trigger.java index 20a878e8cbb..6f52286a779 100644 --- a/src/main/java/forge/card/trigger/Trigger.java +++ b/src/main/java/forge/card/trigger/Trigger.java @@ -327,10 +327,11 @@ public abstract class Trigger { int right = 1; String rightString = lifeCompare.substring(2); - if (rightString.equals("X")) { - right = CardFactoryUtil.xCount(hostCard, hostCard.getSVar("X")); - } else { - right = Integer.parseInt(lifeCompare.substring(2)); + try { + right = Integer.parseInt(rightString); + } + catch (NumberFormatException nfe) { + right = CardFactoryUtil.xCount(hostCard, hostCard.getSVar(rightString)); } if (!AllZoneUtil.compare(life, lifeCompare, right)) {