From 5f592293c30f2e8f89bf7c304881da2aff1e4ce8 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 13:38:59 +0000
Subject: [PATCH] - Fixes for makeToken not copying default color properly.

---
 src/forge/Card.java        | 8 +++++---
 src/forge/CardFactory.java | 2 +-
 src/forge/CardUtil.java    | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/forge/Card.java b/src/forge/Card.java
index 3eac63fedb1..c8c3834c8ae 100644
--- a/src/forge/Card.java
+++ b/src/forge/Card.java
@@ -579,7 +579,7 @@ public class Card extends MyObservable {
     		cardColor.remove(removeCol);
     }
     
-    public Card_Color getColor(){
+    public Card_Color determineColor(){
     	if (this.isImmutable()){
     		return new Card_Color(this);
     	}
@@ -590,12 +590,14 @@ public class Card extends MyObservable {
     	return colors;
     }
     
-    
     public void setColor(ArrayList<Card_Color> colors){
     	cardColor = colors;
     }
     
-    
+    public ArrayList<Card_Color> getColor(){
+    	return cardColor;
+    }
+
     Card_Color determineColor(ArrayList<Card_Color> globalChanges){
     	Card_Color colors = new Card_Color(this);
     	int i = cardColor.size() - 1;
diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index 3dba698657b..379d6b99e21 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -10123,7 +10123,7 @@ public class CardFactory implements NewConstants {
         c.setType(sim.getType());
         c.setText(sim.getSpellText());
         c.setManaCost(sim.getManaCost());
-        c.addColor(sim.getManaCost());
+        c.setColor(sim.getColor());
         c.setSVars(sim.getSVars());
         c.setSets(sim.getSets());
         c.setIntrinsicAbilities(sim.getIntrinsicAbilities());
diff --git a/src/forge/CardUtil.java b/src/forge/CardUtil.java
index 7adcca902e8..522e21fe40e 100644
--- a/src/forge/CardUtil.java
+++ b/src/forge/CardUtil.java
@@ -94,7 +94,7 @@ public class CardUtil {
     }
     
     public static ArrayList<String> getColors(Card c) {
-    	return c.getColor().toStringArray();
+    	return c.determineColor().toStringArray();
     }
     
     public static ArrayList<String> getOnlyColors(Card c) {