From ae3d723387a63cda24c367d010f09fade1b8c0ee Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Thu, 23 Aug 2012 10:54:36 +0000
Subject: [PATCH] - Added support for blocks with up to six sets (by
 RumbleBBU).

---
 src/main/java/forge/card/CardBlock.java                |  5 +++--
 src/main/java/forge/game/limited/SealedDeckFormat.java | 10 ++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/forge/card/CardBlock.java b/src/main/java/forge/card/CardBlock.java
index 18ea22bc0d8..49dc8a5a726 100644
--- a/src/main/java/forge/card/CardBlock.java
+++ b/src/main/java/forge/card/CardBlock.java
@@ -221,7 +221,7 @@ public final class CardBlock implements Comparable<CardBlock> {
 
             String name = null;
             int index = -1;
-            final List<CardEdition> sets = new ArrayList<CardEdition>(4);
+            final List<CardEdition> sets = new ArrayList<CardEdition>(6);
             CardEdition landSet = null;
             int draftBoosters = 3;
             int sealedBoosters = 6;
@@ -233,7 +233,8 @@ public final class CardBlock implements Comparable<CardBlock> {
                     name = kv[1];
                 } else if ("index".equals(key)) {
                     index = Integer.parseInt(kv[1]);
-                } else if ("set0".equals(key) || "set1".equals(key) || "set2".equals(key)) {
+                } else if ("set0".equals(key) || "set1".equals(key) || "set2".equals(key) || "set3".equals(key)
+                        || "set4".equals(key) || "set5".equals(key))  {
                     sets.add(editions.getEditionByCodeOrThrow(kv[1]));
                 } else if ("landsetcode".equals(key)) {
                     landSet = editions.getEditionByCodeOrThrow(kv[1]);
diff --git a/src/main/java/forge/game/limited/SealedDeckFormat.java b/src/main/java/forge/game/limited/SealedDeckFormat.java
index 98acdff16fe..ceaae36a226 100644
--- a/src/main/java/forge/game/limited/SealedDeckFormat.java
+++ b/src/main/java/forge/game/limited/SealedDeckFormat.java
@@ -93,6 +93,16 @@ public class SealedDeckFormat {
                 setCombos.add(String.format("%s/%s/%s/%s/%s/%s", sets[2], sets[2], sets[2], sets[0], sets[0], sets[0]));
                 setCombos.add(String.format("%s/%s/%s/%s/%s/%s", sets[2], sets[2], sets[1], sets[1], sets[0], sets[0]));
             }
+            if (sets.length >= 4) {
+                setCombos.add(String.format("%s/%s/%s/%s/%s/%s", sets[3], sets[2], sets[1], sets[0], sets[0], sets[0]));
+                setCombos.add(String.format("%s/%s/%s/%s/%s/%s", sets[3], sets[2], sets[1], sets[1], sets[0], sets[0]));
+            }
+            if (sets.length >= 5) {
+                setCombos.add(String.format("%s/%s/%s/%s/%s/%s", sets[4], sets[3], sets[2], sets[1], sets[0], sets[0]));
+            }
+            if (sets.length >= 6) {
+                setCombos.add(String.format("%s/%s/%s/%s/%s/%s", sets[5], sets[4], sets[3], sets[2], sets[1], sets[0]));
+            }
 
             if (sets.length > 1) {
                 final Object p = GuiUtils.chooseOne("Choose Set Combination", setCombos.toArray());