external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 18:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Added the keyword "CARDNAME can't be enchanted.".

Browse Source
This commit is contained in:
Sloth
2011-11-08 11:38:31 +00:00
parent 4996c6b10d
commit 80432e6997
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/forge/GameAction.java
View File

@@ -895,9 +895,7 @@ public class GameAction {
if (entity instanceof Card) { if (entity instanceof Card) {
final Card perm = (Card) entity; final Card perm = (Card) entity;
// I think the Keyword checks might be superfluous with if (!AllZoneUtil.isCardInPlay(perm) || perm.hasProtectionFrom(c) || perm.hasKeyword("CARDNAME can't be enchanted.")
// the isValid check
if (!AllZoneUtil.isCardInPlay(perm) || perm.hasProtectionFrom(c)
|| ((tgt != null) && !perm.isValid(tgt.getValidTgts(), c.getController(), c))) { || ((tgt != null) && !perm.isValid(tgt.getValidTgts(), c.getController(), c))) {
c.unEnchantEntity(perm); c.unEnchantEntity(perm);
this.moveToGraveyard(c); this.moveToGraveyard(c);

2
src/main/java/forge/card/cardfactory/CardFactoryUtil.java
View File

@@ -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()) { if (spell.isAura() && spell.isSpell()) {
return false; return false;
} }