From 33d051d6aba346a5f29bfa03cff4e834b26eef71 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Mon, 4 Jan 2016 02:03:23 +0000
Subject: [PATCH] Optimize unlock card logic

---
 .../src/main/java/forge/planarconquest/ConquestData.java | 9 ++++++---
 .../src/main/java/forge/planarconquest/ConquestUtil.java | 1 -
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java
index b1dee635123..bc42fd4e111 100644
--- a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java
+++ b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java
@@ -74,7 +74,12 @@ public final class ConquestData {
         ConquestCommander commander = new ConquestCommander(startingCommander0, startingPlane0.getCardPool(), false);
         commanders.add(commander);
         unlockCard(startingCommander0);
-        unlockCards(commander.getDeck().getMain().toFlatList());
+        for (Entry<PaperCard, Integer> entry : commander.getDeck().getMain()) {
+            PaperCard card = entry.getKey();
+            if (!card.getRules().getType().isBasicLand()) { //ignore basic lands
+                unlockCard(card);
+            }
+        }
     }
 
     public ConquestData(File directory0) {
@@ -151,8 +156,6 @@ public final class ConquestData {
     }
 
     public void unlockCard(PaperCard card) {
-        if (card.getRules().getType().isBasicLand()) { return; } //ignore basic lands
-
         if (unlockedCards.add(card)) {
             newCards.add(card);
         }
diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java b/forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java
index d717b6f8654..6d7623a64e5 100644
--- a/forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java
+++ b/forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java
@@ -9,7 +9,6 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 
 import forge.card.ColorSet;
-import forge.card.MagicColor;
 import forge.deck.CardPool;
 import forge.deck.Deck;
 import forge.deck.DeckFormat;