From 441e871211513c082244537ab86fbf2952d8da1e Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 13:18:26 +0000
Subject: [PATCH] Fixed card image and set code for kiki jiki, stonecloaker and
 the ravnica bounce lands.

---
 src/forge/CardFactory.java           | 4 ++++
 src/forge/CardFactory_Creatures.java | 9 +++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index f4cd1e6485c..1c8279f4019 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -735,6 +735,10 @@ public class CardFactory implements NewConstants {
                             
                             if(!c.isToken()) {
                                 Card newCard = AllZone.CardFactory.getCard(c.getName(), c.getOwner());
+                                
+                                newCard.setCurSetCode(c.getCurSetCode());
+                                newCard.setImageFilename(c.getImageFilename());
+                                
                                 hand.add(newCard);
                             }
                         }
diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java
index 697f1157371..ca11d5b854a 100644
--- a/src/forge/CardFactory_Creatures.java
+++ b/src/forge/CardFactory_Creatures.java
@@ -357,7 +357,7 @@ public class CardFactory_Creatures {
                          
                          for (int i=0;i<multiplier;i++)
                          {
-	                                         	
+	                        //TODO: Use central copy methods
 	                        Card copy;
 	                        if(!getTargetCard().isToken()) {
 	                            //CardFactory cf = new CardFactory("cards.txt");
@@ -406,7 +406,8 @@ public class CardFactory_Creatures {
 	                            copy.addIntrinsicKeyword("Haste");
 	                        }
 	                        
-	                        
+	                        copy.setCurSetCode(getTargetCard().getCurSetCode());
+	                        copy.setImageFilename(getTargetCard().getImageFilename());
 	                        
 	                        PlayerZone play = AllZone.getZone(Constant.Zone.Battlefield, card.getController());
 	                        play.add(copy);
@@ -10569,6 +10570,10 @@ public class CardFactory_Creatures {
                         
                         if(!c.isToken()) {
                             Card newCard = AllZone.CardFactory.getCard(c.getName(), c.getOwner());
+                            
+                            newCard.setCurSetCode(c.getCurSetCode());
+                            newCard.setImageFilename(c.getImageFilename());
+                            
                             hand.add(newCard);
                         }
                     }