From 1b0955b959d0732d3e7d3df544e7ff9842f3337a Mon Sep 17 00:00:00 2001 From: austinio7116 Date: Sun, 4 Mar 2018 06:35:39 +0000 Subject: [PATCH] Removed commented out code and moved comment to correct location --- .../java/forge/limited/CardThemedDeckBuilder.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java b/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java index 4f2bb391d78..bcbbebf6e65 100644 --- a/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java +++ b/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java @@ -102,11 +102,7 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase { } } colors = deckColors.getChosenColors(); - /*colors = keyCard.getRules().getColorIdentity(); - colors = ColorSet.fromMask(colors.getColor() | keyCard.getRules().getColorIdentity().getColor()); - if(secondKeyCard!=null) { - colors = ColorSet.fromMask(colors.getColor() | secondKeyCard.getRules().getColorIdentity().getColor()); - }*/ + if (logColorsToConsole) { System.out.println(keyCard.getName()); System.out.println("Pre Colors: " + colors.toEnumSet().toString()); @@ -240,6 +236,7 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase { addLandKeyCards(); + // 10. Add non-basic lands List duals = getDualLandList(); addNonBasicLands(); if (logToConsole) { @@ -268,7 +265,6 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase { System.out.println("Post Lands : " + deckList.size()); } if (keyCard.getRules().getColorIdentity().isColorless()&&landsNeeded>0){ - // 10. Add non-basic lands that were drafted. addWastesIfRequired(); } fixDeckSize(); @@ -567,11 +563,6 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase { numColors++; } } - /*if (totalColor == 0) { - for (int j = 0; j < nLand; j++) { - deckList.add(getBasicLand(i)); - } - }*/ // do not update landsNeeded until after the loop, because the // calculation involves landsNeeded