From 0945c9e73987e67c9b97baf5b063097ad1bb44eb Mon Sep 17 00:00:00 2001 From: Sloth Date: Fri, 28 Oct 2011 21:10:56 +0000 Subject: [PATCH] - Fixed copyCharacteristics turning all keywords into intrinsic keywords and modified types into printed types. --- src/main/java/forge/Card.java | 2 +- src/main/java/forge/card/cardFactory/CardFactoryUtil.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index b3b5c7844eb..75e5343c67c 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -47,7 +47,7 @@ public class Card extends GameEntity implements Comparable { private boolean isDoubleFaced = false; private boolean isFlip = false; - private CardCharacteristics getCharacteristics() { + public CardCharacteristics getCharacteristics() { return characteristics[currentCharacteristic]; } diff --git a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java index a53f8c5a336..2e93f0bc542 100644 --- a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java @@ -4351,9 +4351,9 @@ public class CardFactoryUtil { To.setBaseLoyalty(From.getBaseLoyalty()); To.setBaseAttackString(From.getBaseAttackString()); To.setBaseDefenseString(From.getBaseDefenseString()); - To.setIntrinsicKeyword(From.getKeyword()); + To.setIntrinsicKeyword(From.getIntrinsicKeyword()); To.setName(From.getName()); - To.setType(From.getType()); + To.setType(From.getCharacteristics().getType()); To.setText(From.getSpellText()); To.setManaCost(From.getManaCost()); To.setColor(From.getColor());