From c26d51e2fed3c182b507a4e38b5bbe4ea3601a0c Mon Sep 17 00:00:00 2001 From: Northmoc Date: Wed, 10 Aug 2022 14:53:29 -0400 Subject: [PATCH] StaticAbilityPanharmonicon remove unneeded checks --- .../staticability/StaticAbilityPanharmonicon.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityPanharmonicon.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityPanharmonicon.java index 268ba3562a4..e71134638b5 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityPanharmonicon.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityPanharmonicon.java @@ -108,17 +108,13 @@ public class StaticAbilityPanharmonicon { return false; } } else if (trigMode.equals(TriggerType.Attacks)) { - if (stAb.hasParam("ValidCause")) { - if (!stAb.matchesValidParam("ValidCause", runParams.get(AbilityKey.Attacker))) { - return false; - } + if (!stAb.matchesValidParam("ValidCause", runParams.get(AbilityKey.Attacker))) { + return false; } } else if (trigMode.equals(TriggerType.AttackersDeclared) || trigMode.equals(TriggerType.AttackersDeclaredOneTarget)) { - if (stAb.hasParam("ValidCause")) { - if (!stAb.matchesValidParam("ValidCause", runParams.get(AbilityKey.Attackers))) { - return false; - } + if (!stAb.matchesValidParam("ValidCause", runParams.get(AbilityKey.Attackers))) { + return false; } } else if (trigMode.equals(TriggerType.SpellCastOrCopy) || trigMode.equals(TriggerType.SpellCast) || trigMode.equals(TriggerType.SpellCopy)) {