diff --git a/src/main/java/forge/CardUtil.java b/src/main/java/forge/CardUtil.java index 62eab0b06cd..43a31795c33 100644 --- a/src/main/java/forge/CardUtil.java +++ b/src/main/java/forge/CardUtil.java @@ -257,19 +257,23 @@ public final class CardUtil { public static ArrayList getOnlyColors(final Card c) { final CardManaCost m = c.getManaCost(); final byte color_profile = m.getColorProfile(); - - final Set colors = new HashSet(); - if ((color_profile & forge.card.CardColor.WHITE) > 0 ) - colors.add(Constant.Color.WHITE); - if ((color_profile & forge.card.CardColor.BLACK) > 0 ) - colors.add(Constant.Color.BLACK); - if ((color_profile & forge.card.CardColor.BLUE) > 0 ) - colors.add(Constant.Color.BLUE); - if ((color_profile & forge.card.CardColor.RED) > 0 ) - colors.add(Constant.Color.RED); - if ((color_profile & forge.card.CardColor.GREEN) > 0 ) - colors.add(Constant.Color.GREEN); + final Set colors = new HashSet(); + if ((color_profile & forge.card.CardColor.WHITE) > 0) { + colors.add(Constant.Color.WHITE); + } + if ((color_profile & forge.card.CardColor.BLACK) > 0) { + colors.add(Constant.Color.BLACK); + } + if ((color_profile & forge.card.CardColor.BLUE) > 0) { + colors.add(Constant.Color.BLUE); + } + if ((color_profile & forge.card.CardColor.RED) > 0) { + colors.add(Constant.Color.RED); + } + if ((color_profile & forge.card.CardColor.GREEN) > 0) { + colors.add(Constant.Color.GREEN); + } for (final String kw : c.getKeyword()) { if (kw.startsWith(c.getName() + " is ") || kw.startsWith("CARDNAME is ")) { diff --git a/src/main/java/forge/Counters.java b/src/main/java/forge/Counters.java index 51a742185cc..d6efe71e84a 100644 --- a/src/main/java/forge/Counters.java +++ b/src/main/java/forge/Counters.java @@ -76,7 +76,7 @@ public enum Counters { /** The DESPAIR. */ DESPAIR(), - + /** The DEVOTION. */ DEVOTION(), diff --git a/src/main/java/forge/card/CardManaCost.java b/src/main/java/forge/card/CardManaCost.java index df7ea2d53c7..424903b6173 100644 --- a/src/main/java/forge/card/CardManaCost.java +++ b/src/main/java/forge/card/CardManaCost.java @@ -137,15 +137,17 @@ public final class CardManaCost implements Comparable { public List getShards() { return this.shards; } - + public int getShardCount(ManaCostShard which) { - if ( which == ManaCostShard.COLORLESS ) + if (which == ManaCostShard.COLORLESS) { return genericCost; + } int res = 0; - for(ManaCostShard shard : shards) - { - if ( shard == which ) res++; + for (ManaCostShard shard : shards) { + if (shard == which) { + res++; + } } return res; }