From 5b600bf59279f000034d8a039acb8aa47fd7329c Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Sat, 18 Oct 2014 00:05:14 +0000
Subject: [PATCH] Fix so cards with multiple subtypes have them appear in the
 correct order

---
 forge-core/src/main/java/forge/card/CardType.java         | 2 +-
 forge-gui/src/main/java/forge/limited/BoosterDraftAI.java | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/forge-core/src/main/java/forge/card/CardType.java b/forge-core/src/main/java/forge/card/CardType.java
index 5186776a01a..ab48d29d92b 100644
--- a/forge-core/src/main/java/forge/card/CardType.java
+++ b/forge-core/src/main/java/forge/card/CardType.java
@@ -89,7 +89,7 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
 
     private final EnumSet<CoreType> coreTypes = EnumSet.noneOf(CoreType.class);
     private final EnumSet<Supertype> supertypes = EnumSet.noneOf(Supertype.class);
-    private final HashSet<String> subtypes = new HashSet<String>();
+    private final LinkedHashSet<String> subtypes = new LinkedHashSet<String>();
     private String calculatedType = null;
 
     public CardType() {
diff --git a/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java b/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java
index 4509d1e5e24..3e82a313c3e 100644
--- a/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java
+++ b/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java
@@ -93,7 +93,6 @@ public class BoosterDraftAI {
             }
         }
 
-        int cntBestCards = 0;
         double bestRanking = Double.MAX_VALUE;
         PaperCard bestPick = null;
         final List<PaperCard> possiblePick = new ArrayList<PaperCard>();