From 80432e6997b95e15f91db94e14908c1cf9e57f86 Mon Sep 17 00:00:00 2001 From: Sloth Date: Tue, 8 Nov 2011 11:38:31 +0000 Subject: [PATCH] - Added the keyword "CARDNAME can't be enchanted.". --- src/main/java/forge/GameAction.java | 4 +--- src/main/java/forge/card/cardfactory/CardFactoryUtil.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java index d3b3ced3e18..4697b586f8f 100644 --- a/src/main/java/forge/GameAction.java +++ b/src/main/java/forge/GameAction.java @@ -895,9 +895,7 @@ public class GameAction { if (entity instanceof Card) { final Card perm = (Card) entity; - // I think the Keyword checks might be superfluous with - // the isValid check - if (!AllZoneUtil.isCardInPlay(perm) || perm.hasProtectionFrom(c) + if (!AllZoneUtil.isCardInPlay(perm) || perm.hasProtectionFrom(c) || perm.hasKeyword("CARDNAME can't be enchanted.") || ((tgt != null) && !perm.isValid(tgt.getValidTgts(), c.getController(), c))) { c.unEnchantEntity(perm); this.moveToGraveyard(c); diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java index edb28c4ba29..15240e45a8b 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java @@ -2479,7 +2479,7 @@ public class CardFactoryUtil { } } - if (kw.equals("CARDNAME can't be the target of Aura spells.")) { + if (kw.equals("CARDNAME can't be the target of Aura spells.") || kw.equals("CARDNAME can't be enchanted.")) { if (spell.isAura() && spell.isSpell()) { return false; }