- Fixes for makeToken not copying default color properly.

This commit is contained in:
jendave
2011-08-06 13:38:59 +00:00
parent ba15b9db5d
commit 5f592293c3
3 changed files with 7 additions and 5 deletions

View File

@@ -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;

View File

@@ -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());

View File

@@ -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) {