From bba687411a95f1b6423bfa81f2a20b4eae486f03 Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Sun, 16 Dec 2012 06:50:21 +0000
Subject: [PATCH] - Sideboarding: during deck validation between the duels in a
 match, the deck will be considered valid if it's no less than either the
 format-enforced minimum or the minimum after the previous duel in a match (to
 account for the possibility of losing a card on ante).

---
 src/main/java/forge/game/GameNew.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/forge/game/GameNew.java b/src/main/java/forge/game/GameNew.java
index e09d76b903f..3540d34633e 100644
--- a/src/main/java/forge/game/GameNew.java
+++ b/src/main/java/forge/game/GameNew.java
@@ -184,13 +184,13 @@ public class GameNew {
             // Human Sideboarding
             boolean validDeck = false;
             List<Card> newDeck = null;
-            int deckMinSize = gameType.getDeckMinimum();
+            int deckMinSize = Math.min(deck.getMain().countAll(), gameType.getDeckMinimum());
 
             while (!validDeck) {
                 newDeck = GuiChoose.getOrderChoices("Sideboard", "Main Deck", sideboardSize,
                     deck.getSideboard().toForgeCardList(), deck.getMain().toForgeCardList(), null, true);
 
-                if (newDeck.size() >= deckMinSize || !gameType.isLimited()) {
+                if (newDeck.size() >= deckMinSize) {
                     validDeck = true;
                 } else {
                     StringBuilder errMsg = new StringBuilder("Too few cards in your main deck (minimum ");