From 18f32a1657e9aa30c4a6bc75bd8ff3c4dd0e9a4d Mon Sep 17 00:00:00 2001
From: Adam Pantel <adam.pantel@nextgenvest.com>
Date: Sat, 23 Mar 2019 00:48:58 -0400
Subject: [PATCH] Fix draft duplicates bug

---
 .../src/main/java/forge/limited/LimitedDeckBuilder.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java b/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java
index 77122cce593..28c653301de 100644
--- a/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java
+++ b/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java
@@ -92,7 +92,7 @@ public class LimitedDeckBuilder extends DeckGeneratorBase {
         final Iterable<PaperCard> conspiracies = Iterables.filter(aiPlayables,
                 Predicates.compose(CardRulesPredicates.coreType(true, "Conspiracy"), PaperCard.FN_GET_RULES));
         this.draftedConspiracies = Lists.newArrayList(conspiracies);
-        aiPlayables.removeAll(draftedConspiracies);
+        this.aiPlayables.removeAll(draftedConspiracies);
 
         findBasicLandSets();
     }
@@ -177,6 +177,7 @@ public class LimitedDeckBuilder extends DeckGeneratorBase {
             if (card != null) {
                 deckList.add(card);
                 aiPlayables.remove(card);
+                rankedColorList.remove(card);
                 landsNeeded--;
                 if (logToConsole) {
                     System.out.println("Low CMC: " + card.getName());
@@ -291,6 +292,7 @@ public class LimitedDeckBuilder extends DeckGeneratorBase {
                 final PaperCard c = aiPlayables.get(MyRandom.getRandom().nextInt(aiPlayables.size() - 1));
                 deckList.add(c);
                 aiPlayables.remove(c);
+                rankedColorList.remove(c);
                 if (logToConsole) {
                     System.out.println(" - Added " + c.getName() + " randomly.");
                 }
@@ -298,6 +300,7 @@ public class LimitedDeckBuilder extends DeckGeneratorBase {
                 final PaperCard c = aiPlayables.get(0);
                 deckList.add(c);
                 aiPlayables.remove(c);
+                rankedColorList.remove(c);
                 if (logToConsole) {
                     System.out.println(" - Added " + c.getName() + " randomly.");
                 }
@@ -522,6 +525,7 @@ public class LimitedDeckBuilder extends DeckGeneratorBase {
             }
             deckList.addAll(toAdd);
             aiPlayables.removeAll(toAdd);
+            rankedColorList.removeAll(toAdd);
         }
     }