mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-19 12:18:00 +00:00
- Fixes for makeToken not copying default color properly.
This commit is contained in:
@@ -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,11 +590,13 @@ 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);
|
||||
|
||||
@@ -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());
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user