diff --git a/forge-game/src/main/java/forge/game/ForgeScript.java b/forge-game/src/main/java/forge/game/ForgeScript.java index fd84a49f73a..aec9121c12d 100644 --- a/forge-game/src/main/java/forge/game/ForgeScript.java +++ b/forge-game/src/main/java/forge/game/ForgeScript.java @@ -168,6 +168,10 @@ public class ForgeScript { if (!sa.isFlashBackAbility()) { return false; } + } else if (property.equals("Kicked")) { + if (!sa.isKicked()) { + return false; + } } else if (property.equals("Aftermath")) { if (!sa.isAftermath()) { return false; 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 4522c48dda6..7d005e80eb8 100644 --- a/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java +++ b/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java @@ -337,6 +337,10 @@ public class AbilityManaPart implements java.io.Serializable { } } + if (sa.isValid(restriction, this.getSourceCard().getController(), this.getSourceCard(), null)) { + return true; + } + if (sa.isAbility()) { if (restriction.startsWith("Activated")) { restriction = TextUtil.fastReplace(restriction, "Activated", "Card");