From 187f700c2cb19944410fbc2e52298b95f9618434 Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Sun, 10 Mar 2013 18:34:27 +0000
Subject: [PATCH] - Fixed the sideboarding code not allowing a deck with more
 cards than the original deck in Limited (Sealed, Draft) modes.

---
 src/main/java/forge/game/player/PlayerControllerHuman.java | 3 ++-
 src/main/java/forge/gui/GuiChoose.java                     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/forge/game/player/PlayerControllerHuman.java b/src/main/java/forge/game/player/PlayerControllerHuman.java
index 0ed479af529..0282bde6975 100644
--- a/src/main/java/forge/game/player/PlayerControllerHuman.java
+++ b/src/main/java/forge/game/player/PlayerControllerHuman.java
@@ -145,7 +145,8 @@ public class PlayerControllerHuman extends PlayerController {
                 JOptionPane.showMessageDialog(null, errMsg, "Invalid deck", JOptionPane.ERROR_MESSAGE);
             }
             
-            newMain = GuiChoose.sideboard(sideboard.toFlatList(), main.toFlatList());
+            boolean isLimited = (gameType == GameType.Draft || gameType == GameType.Sealed);
+            newMain = GuiChoose.sideboard(sideboard.toFlatList(), main.toFlatList(), isLimited);
         }
     
         newSb.clear();
diff --git a/src/main/java/forge/gui/GuiChoose.java b/src/main/java/forge/gui/GuiChoose.java
index ad1cee846fa..bdfe19f9dec 100644
--- a/src/main/java/forge/gui/GuiChoose.java
+++ b/src/main/java/forge/gui/GuiChoose.java
@@ -149,10 +149,10 @@ public class GuiChoose {
         return order(title, top, remainingObjects, sourceChoices, destChoices, referenceCard, false);
     }
 
-    public static <T extends Comparable<? super T>> List<T> sideboard(List<T> sideboard, List<T> deck) {
+    public static <T extends Comparable<? super T>> List<T> sideboard(List<T> sideboard, List<T> deck, boolean isLimitedMode) {
         Collections.sort(deck);
         Collections.sort(sideboard);
-        return order("Sideboard", "Main Deck", sideboard.size(), sideboard, deck, null, true);
+        return order("Sideboard", "Main Deck", isLimitedMode ? -1 : sideboard.size(), sideboard, deck, null, true);
     }