diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java b/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java index 35000dfdd39..a75c12fe634 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java @@ -1127,7 +1127,7 @@ public class ModernCardRenderer extends CardRenderer { protected static Paint getBorderPaint(ObjectColor colors, Collection types, int width) { if (colors.isMulticolored()) { if (colors.getColorCount() == 2) { - List twoColors = colors.getTwoColorsInOrder(); + List twoColors = colors.getColors(); // Two-color frames look better if we use a whiter white // than the normal white frame color for them, as the normal @@ -1203,7 +1203,7 @@ public class ModernCardRenderer extends CardRenderer { protected static Paint getTextboxPaint(ObjectColor colors, Collection types, int width) { if (colors.isMulticolored()) { if (colors.getColorCount() == 2) { - List twoColors = colors.getTwoColorsInOrder(); + List twoColors = colors.getColors(); Color[] translatedColors; if (types.contains(CardType.LAND)) { translatedColors = new Color[]{ diff --git a/Mage/src/main/java/mage/ObjectColor.java b/Mage/src/main/java/mage/ObjectColor.java index a71e0930475..0c055fa9d65 100644 --- a/Mage/src/main/java/mage/ObjectColor.java +++ b/Mage/src/main/java/mage/ObjectColor.java @@ -154,30 +154,6 @@ public class ObjectColor implements Serializable, Copyable, Compara } public List getColors() { - List colors = new ArrayList<>(); - if (this.isWhite()) { - colors.add(ObjectColor.WHITE); - } - if (this.isBlue()) { - colors.add(ObjectColor.BLUE); - } - if (this.isBlack()) { - colors.add(ObjectColor.BLACK); - } - if (this.isRed()) { - colors.add(ObjectColor.RED); - } - if (this.isGreen()) { - colors.add(ObjectColor.GREEN); - } - - if (this.isGold()) { - colors.add(ObjectColor.GOLD); - } - return colors; - } - - public List getTwoColorsInOrder() { List colors = new ArrayList<>(); int firstColor = 5000; int secondColor = -1; @@ -554,5 +530,4 @@ public class ObjectColor implements Serializable, Copyable, Compara colors.add(ObjectColor.GOLD); return colors; } - }