From d311231c9635942af85fcc02bb9eb1b4ead5b51b Mon Sep 17 00:00:00 2001 From: rory Date: Mon, 11 May 2020 16:46:48 -0700 Subject: [PATCH] move CantPayGenericCosts higher up in mana restrictions so that the activated restriction doesn't short circuit for loop --- .../java/forge/game/spellability/AbilityManaPart.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java b/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java index 752f83372bb..67ea16a993e 100644 --- a/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java +++ b/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java @@ -365,6 +365,10 @@ public class AbilityManaPart implements java.io.Serializable { if (sa.isValid(restriction, this.getSourceCard().getController(), this.getSourceCard(), null)) { return true; } + + if (restriction.equals("CantPayGenericCosts")) { + return true; + } if (sa.isAbility()) { if (restriction.startsWith("Activated")) { @@ -381,10 +385,6 @@ public class AbilityManaPart implements java.io.Serializable { return true; } } - - if (restriction.equals("CantPayGenericCosts")) { - return true; - } }