From ffcc38d8c4dcfce397efb4e56cbf633eb61e3dbb Mon Sep 17 00:00:00 2001
From: Jeremy Pelkala <jeremypelkala@gmail.com>
Date: Thu, 8 Nov 2018 11:51:21 -0500
Subject: [PATCH] Commander Quest checkstyle and bugfixes

-QuestEventCommanderDuelManager
Removed unused imports

-CEditorQuest
Fixed colorless cards getting filtered out of deck creation.
---
 .../screens/deckeditor/controllers/CEditorQuest.java     | 9 +++++++--
 .../java/forge/quest/QuestEventCommanderDuelManager.java | 3 ---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java
index b7842272e42..c09e0a18d48 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java
@@ -322,7 +322,7 @@ public final class CEditorQuest extends CDeckEditor<Deck> {
         public boolean apply(PaperCard subject) {
             CardRules cr = subject.getRules();
             ManaCost mc = cr.getManaCost();
-            return !mc.isPureGeneric() && allowedColor.containsAllColorsFrom(cr.getColorIdentity().getColor());
+            return allowedColor.containsAllColorsFrom(cr.getColorIdentity().getColor());
         }
     }
 
@@ -336,7 +336,10 @@ public final class CEditorQuest extends CDeckEditor<Deck> {
         List<String> colors = new ArrayList<>();
 
         //Return early if there are no current commanders
-        if(commanders.size() == 0) return ColorSet.fromNames(colors);
+        if(commanders.size() == 0){
+            colors.add("c");
+            return ColorSet.fromNames(colors);
+        }
 
         //For each commander,add each color of its color identity if not already added
         for(PaperCard pc : commanders){
@@ -347,6 +350,8 @@ public final class CEditorQuest extends CDeckEditor<Deck> {
             if(!colors.contains("g") && pc.getRules().getColorIdentity().hasGreen()) colors.add("g");
         }
 
+        colors.add("c");
+
         return ColorSet.fromNames(colors);
     }
 
diff --git a/forge-gui/src/main/java/forge/quest/QuestEventCommanderDuelManager.java b/forge-gui/src/main/java/forge/quest/QuestEventCommanderDuelManager.java
index 384d9d11d77..c9fbaa3457c 100644
--- a/forge-gui/src/main/java/forge/quest/QuestEventCommanderDuelManager.java
+++ b/forge-gui/src/main/java/forge/quest/QuestEventCommanderDuelManager.java
@@ -4,10 +4,7 @@ import forge.deck.*;
 import forge.item.PaperCard;
 import forge.model.FModel;
 import forge.quest.data.QuestPreferences;
-import forge.util.CollectionSuppliers;
 import forge.util.MyRandom;
-import forge.util.maps.EnumMapOfLists;
-import forge.util.maps.MapOfLists;
 
 import java.util.ArrayList;
 import java.util.Collections;