From 8f703832f120b36a23126d94487e17ff6f0f021c Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Fri, 3 Aug 2012 19:19:33 +0000 Subject: [PATCH] some minor optimizations to SealedDeck --- src/main/java/forge/game/limited/SealedDeck.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/forge/game/limited/SealedDeck.java b/src/main/java/forge/game/limited/SealedDeck.java index 178fc0614f6..adda5f1c84f 100644 --- a/src/main/java/forge/game/limited/SealedDeck.java +++ b/src/main/java/forge/game/limited/SealedDeck.java @@ -44,16 +44,16 @@ public class SealedDeck extends LimitedDeck { final List colorChooserList = new ArrayList(); double limit = rankedCards.size() * .33; for (int i = 0; i < limit; i++) { - colorChooserList.add(rankedCards.get(i).getCardPrinted()); - System.out.println(rankedCards.get(i).getCardPrinted().getName() + " " - + rankedCards.get(i).getCardPrinted().getCard().getManaCost().toString()); + CardPrinted cp = rankedCards.get(i).getCardPrinted(); + colorChooserList.add(cp); + System.out.println(cp.getName() + " " + cp.getCard().getManaCost().toString()); } - int white = CardRules.Predicates.Presets.IS_WHITE.select(colorChooserList, CardPrinted.FN_GET_RULES).size(); - int blue = CardRules.Predicates.Presets.IS_BLUE.select(colorChooserList, CardPrinted.FN_GET_RULES).size(); - int black = CardRules.Predicates.Presets.IS_BLACK.select(colorChooserList, CardPrinted.FN_GET_RULES).size(); - int red = CardRules.Predicates.Presets.IS_RED.select(colorChooserList, CardPrinted.FN_GET_RULES).size(); - int green = CardRules.Predicates.Presets.IS_GREEN.select(colorChooserList, CardPrinted.FN_GET_RULES).size(); + int white = CardRules.Predicates.Presets.IS_WHITE.count(colorChooserList, CardPrinted.FN_GET_RULES); + int blue = CardRules.Predicates.Presets.IS_BLUE.count(colorChooserList, CardPrinted.FN_GET_RULES); + int black = CardRules.Predicates.Presets.IS_BLACK.count(colorChooserList, CardPrinted.FN_GET_RULES); + int red = CardRules.Predicates.Presets.IS_RED.count(colorChooserList, CardPrinted.FN_GET_RULES); + int green = CardRules.Predicates.Presets.IS_GREEN.count(colorChooserList, CardPrinted.FN_GET_RULES); final int[] colorCounts = { white, blue, black, red, green }; final String[] colors = Constant.Color.ONLY_COLORS; int[] countsCopy = Arrays.copyOf(colorCounts, 5);