From 28e6c209f1f26aefc078f56c3e837810055ba2d9 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 03:29:45 +0000 Subject: [PATCH] - Reverted the copyCard change (it caused some funky bugs - CIP / leaves play triggers got added twice to cards), and moved it to a separate method. --- src/forge/CardFactory.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index f174e3c24a3..6feed69300f 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -101,13 +101,8 @@ public class CardFactory implements NewConstants { } }// readCard() - final public Card copyCard(Card in) { - /* - Card out = getCard(in.getName(), in.getOwner()); - out.setUniqueNumber(in.getUniqueNumber()); - return out; - */ - + final public Card dynamicCopyCard(Card in) + { if(in.getType().contains("Creature")) { Card card2 = new Card(); card2 = CardFactory_Creatures.getCard(in, in.getName(), in.getOwner(), this); @@ -142,6 +137,14 @@ public class CardFactory implements NewConstants { } } + final public Card copyCard(Card in) { + + Card out = getCard(in.getName(), in.getOwner()); + out.setUniqueNumber(in.getUniqueNumber()); + return out; + + } + /* final public Card getCard(String cardName, String owner) { cardName = AllZone.NameChanger.getOriginalName(cardName); @@ -4386,7 +4389,7 @@ public class CardFactory implements NewConstants { //copy card to reset card attributes like attack and defense Card c = abilityComes.getTargetCard(); if(!c.isToken()) { - c = AllZone.CardFactory.copyCard(c); + c = AllZone.CardFactory.dynamicCopyCard(c); c.setController(c.getOwner()); PlayerZone play = AllZone.getZone(Constant.Zone.Play, c.getOwner());