github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-12 17:00:08 -09:00
Code Issues Projects Releases Packages Wiki Activity

fixed bug where one couldn't create a sideboard in the deck editor

Browse source
This commit is contained in:
North 2013-07-06 10:46:18 +03:00
parent d9b37cc12a
commit 4657268476
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
View file

@ -28,7 +28,6 @@
package mage.client.deckeditor;
import mage.cards.Card;
import mage.cards.CardImpl;
import mage.cards.decks.Deck;
import mage.cards.decks.importer.DeckImporter;
import mage.cards.decks.importer.DeckImporterUtil;
@ -203,7 +202,7 @@ public class DeckEditorPanel extends javax.swing.JPanel {
CardInfo cardInfo = CardRepository.instance.findCard(cardView.getExpansionSetCode(), cardView.getCardNumber());
Card card = cardInfo != null ? cardInfo.getMockCard() : null;
if (card != null) {
deck.getSideboard().add(CardImpl.createCard(card.getClass()));
deck.getSideboard().add(card);
}
if (cardInfoPane instanceof CardInfoPane) {
((CardInfoPane)cardInfoPane).setCard(new CardView(card), null);
@ -525,7 +524,7 @@ public class DeckEditorPanel extends javax.swing.JPanel {
File file = fcSelectDeck.getSelectedFile();
try {
setCursor(new Cursor(Cursor.WAIT_CURSOR));
deck = Deck.load(DeckImporterUtil.importDeck(file.getPath()), true);
deck = Deck.load(DeckImporterUtil.importDeck(file.getPath()), true, true);
} catch (GameException ex) {
JOptionPane.showMessageDialog(MageFrame.getDesktop(), ex.getMessage(), "Error loading deck", JOptionPane.ERROR_MESSAGE);
} catch (Exception ex) {