From 9268281c4b710f0472ec80bfe6468080841a7894 Mon Sep 17 00:00:00 2001
From: Oleg Agafonov <jaydi85@gmail.com>
Date: Sat, 27 Jan 2018 15:13:45 +0400
Subject: [PATCH] Tests: fixed random gen deck

---
 .../java/org/mage/test/load/LoadTest.java     | 21 +++++++++++++++++--
 Mage/src/main/java/mage/cards/Sets.java       |  1 +
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/Mage.Tests/src/test/java/org/mage/test/load/LoadTest.java b/Mage.Tests/src/test/java/org/mage/test/load/LoadTest.java
index 555c7611d26..2b9026898aa 100644
--- a/Mage.Tests/src/test/java/org/mage/test/load/LoadTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/load/LoadTest.java
@@ -208,7 +208,7 @@ public class LoadTest {
     @Test
     @Ignore
     public void test_GameThreadWithAbort() {
-        // simple game thread with game abort
+        // simple game thread to abort
 
         LoadGame game = new LoadGame(
                 "game",
@@ -221,10 +221,27 @@ public class LoadTest {
         Assert.assertEquals("aborted", game.gameResult);
     }
 
+    @Test
+    @Ignore
+    public void test_GameThreadWithRealCards() {
+        // simple game thread to the end with creatures cards
+
+        LoadGame game = new LoadGame(
+                "game",
+                "thread",
+                createSimpleDeck("GR", false),
+                createSimpleDeck("GR", false)
+        );
+
+        game.gameStart();
+        game.gameWaitToStop();
+        Assert.assertEquals("finished", game.gameResult);
+    }
+
     @Test
     @Ignore
     public void test_GameThreadWithConcede() {
-        // simple game thread with game abort
+        // simple game thread with with concede
 
         LoadGame game = new LoadGame(
                 "game",
diff --git a/Mage/src/main/java/mage/cards/Sets.java b/Mage/src/main/java/mage/cards/Sets.java
index a973990ce62..2f02549e7d6 100644
--- a/Mage/src/main/java/mage/cards/Sets.java
+++ b/Mage/src/main/java/mage/cards/Sets.java
@@ -168,6 +168,7 @@ public class Sets extends HashMap<String, ExpansionSet> {
                         if (manaLand.getBlack() > 0 && !manaNeed.isBlack()) { cardManaOK = false; }
                         if (manaLand.getRed() > 0 && !manaNeed.isRed()) { cardManaOK = false; }
                         if (manaLand.getGreen() > 0 && !manaNeed.isGreen()) { cardManaOK = false; }
+                        if (manaLand.getColorless() > 0) { cardManaOK = false; } // ignore colorless land (wastes)
                     }
                 } else {
                     // cards