From 95cd28cb2290690ea543b3d8ef4a7383487c9c41 Mon Sep 17 00:00:00 2001
From: BetaSteward <betasteward@gmail>
Date: Sat, 13 Nov 2010 16:25:16 +0000
Subject: [PATCH] fixed decks and deck loading in editor

---
 .../sample-decks/SanDiegoLuisScott-Vargas.dck | Bin 1320 -> 1323 bytes
 .../release/sample-decks/UW Control.dck       | Bin 1182 -> 1185 bytes
 .../release/sample-decks/WhiteTokens.dck      | Bin 992 -> 994 bytes
 .../client/deckeditor/DeckEditorPanel.java    |   2 +-
 Mage/src/mage/cards/decks/Deck.java           |  16 ++++++++++++----
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Mage.Client/release/sample-decks/SanDiegoLuisScott-Vargas.dck b/Mage.Client/release/sample-decks/SanDiegoLuisScott-Vargas.dck
index b0aa4e4aa795cce4aae37eed1c35e1d6c692efd0..7c409355619e0270a047cc5ce831b5a3f8122e05 100644
GIT binary patch
delta 41
xcmZ3%wVG?gR+h>4Smc;X7*r-dWR?*0Ps+(G%goOU%FIhIWT<11pZteK2LLh34n6<?

delta 83
zcmZ3@wSsHIRu*@~+{E-$z2el8V!eW##JtqxjKtzpJ^!Sf%(Be<yr9gy^g@O@2DuUj
eS%kvm{JgZB(h9wR#FC7VeAkN1oYcwxS#$vUbsmcV

diff --git a/Mage.Client/release/sample-decks/UW Control.dck b/Mage.Client/release/sample-decks/UW Control.dck
index cccac0fc290d280cd05767aba036dceeafc02404..79d23cd7e56631dc4a077d0fcbd6cab466a1baf7 100644
GIT binary patch
delta 206
zcmbQoxsY>%EaPNvMpbT(LWVj92r;>uQImzUgh6WZ1tyWndl<PGxh5ZHRAJ<v{Dv`#
zlNY3rw}e4`asZ3S<YXpsZa$C*gqYmQq|V4cc`cJGn;=M3aPki(Ic^~k6GBXW$0R%1
zj+vWV7$gQECWkP4^NE7^5Tb-Z8Eo@GX5q>6nI$H_Vea6Q0!c%N5(bsY?-?a{{F8Dr
R%QExxf->{cCzrBl0s#EmG!Os)

delta 218
zcmZ3;IgfLLETfKMZen_>UU6zkv0gz=VqR);Mq+WQo_|tKW?5!_UQlLUdLcs{0|%Ix
zEX}CS%?V;ch{?W;nv7hN%NZ3JxhK~%iB4X}$j`_#c^_jG8y`p&-()!^J#Kyw6GBW5
zXHsVr04jB569S0}O+LjWCn^kLq7#$<GRbj^fMg)VWHn}QZZQxaLQJk<*5Vci@gc<I
Ojm%RSr6*UgXaWF%4mD~3

diff --git a/Mage.Client/release/sample-decks/WhiteTokens.dck b/Mage.Client/release/sample-decks/WhiteTokens.dck
index 1a0bc8e5104a69fb902b3a0667be2896ad22bdb0..830c2b4f396f534a0621c50eaae35b8da10561c4 100644
GIT binary patch
delta 161
zcmaFB{)l~p9@FGdCM7=JLWVj92vNcyKk<Rc<e5zTjC_+<GHEgLPrkyW#Vr6*0U;*d
z6`!oYEW|Ac5`qwuZJCuO_cAN-34_ESL<xf&&>*wm{L-B8#G;hcJdl(~34=;*VtT4x
macW7iUU3FcqBuV-F(<JoQO`dqC$lUwKQAaVFMaX`W&;3%6fTkg

delta 184
zcmaFF{(yah9+RqkZen_>UU6zkv0gz=VqR);Mq+WQUT}VCPIzKbN@`vqLmdO}WF00I
zK0Xi=LX<GbPkbOE5T21)lIoq8nVwMslH;G;#H7V2FnKML7PlZs076W>D?a%rlMuHM
rNC-kq7GqY@QN(Jqe^O3nS!RA-P-b2_NP`HNm~6(Z!YDd<6SDyTbc#0l

diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
index de9af8989fd..aa2e17fcafa 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
@@ -276,7 +276,7 @@ public class DeckEditorPanel extends javax.swing.JPanel {
 			File file = fcSelectDeck.getSelectedFile();
 			try {
 				setCursor(new Cursor(Cursor.WAIT_CURSOR));
-				deck = Deck.load(DeckCardLists.load(file.getPath()));
+				deck = Deck.load(DeckCardLists.load(file.getPath()), true);
 			} catch (GameException ex) {
 				JOptionPane.showMessageDialog(MageFrame.getDesktop(), ex.getMessage(), "Error loading deck", JOptionPane.ERROR_MESSAGE);
 			} catch (Exception ex) {
diff --git a/Mage/src/mage/cards/decks/Deck.java b/Mage/src/mage/cards/decks/Deck.java
index ce7349aecf1..5ebba4cfb80 100644
--- a/Mage/src/mage/cards/decks/Deck.java
+++ b/Mage/src/mage/cards/decks/Deck.java
@@ -41,21 +41,29 @@ public class Deck implements Serializable {
 	private Set<Card> sideboard = new LinkedHashSet<Card>();
 
 	public static Deck load(DeckCardLists deckCardLists) throws GameException {
+		return Deck.load(deckCardLists, false);
+	}
+
+	public static Deck load(DeckCardLists deckCardLists, boolean ignoreErrors) throws GameException {
 		Deck deck = new Deck();
 		deck.setName(deckCardLists.getName());
 		for (String cardName: deckCardLists.getCards()) {
 			Card card = CardImpl.createCard(cardName);
 			if (card != null)
 				deck.cards.add(CardImpl.createCard(cardName));
-			else
-				throw new GameException("Error loading card - " + cardName + " for deck - " + deck.getName());
+			else {
+				if (!ignoreErrors)
+					throw new GameException("Error loading card - " + cardName + " for deck - " + deck.getName());
+			}
 		}
 		for (String cardName: deckCardLists.getSideboard()) {
 			Card card = CardImpl.createCard(cardName);
 			if (card != null)
 				deck.sideboard.add(CardImpl.createCard(cardName));
-			else
-				throw new GameException("Error loading card - " + cardName + " for deck - " + deck.getName());
+			else {
+				if (!ignoreErrors)
+					throw new GameException("Error loading card - " + cardName + " for deck - " + deck.getName());
+			}
 		}
 
 		return deck;