github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-24 11:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2869 from spjspj/master

Browse source 
Limit deck to 1000 cards
This commit is contained in:
spjspj 2017-02-16 08:07:17 +11:00 committed by GitHub
commit fbbfc6c611
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Mage/src/main/java/mage/cards/decks/Deck.java
View file

@ -86,11 +86,15 @@ public class Deck implements Serializable {
deck.cardsLayout = deckCardLists.getCardLayout();
deck.sideboardLayout = deckCardLists.getSideboardLayout();
List<String> deckCardNames = new ArrayList<>();
int totalCards = 0;
for (DeckCardInfo deckCardInfo : deckCardLists.getCards()) {
Card card = createCard(deckCardInfo, mockCards);
if (card != null) {
deck.cards.add(card);
deckCardNames.add(card.getName());
if (totalCards < 1000) {
deck.cards.add(card);
deckCardNames.add(card.getName());
totalCards++;
}
} else if (!ignoreErrors) {
throw createCardNotFoundGameException(deckCardInfo, deckCardLists.getName());
}
@ -99,8 +103,11 @@ public class Deck implements Serializable {
for (DeckCardInfo deckCardInfo : deckCardLists.getSideboard()) {
Card card = createCard(deckCardInfo, mockCards);
if (card != null) {
deck.sideboard.add(card);
sbCardNames.add(card.getName());
if (totalCards < 1000) {
deck.sideboard.add(card);
sbCardNames.add(card.getName());
totalCards++;
}
} else if (!ignoreErrors) {
throw createCardNotFoundGameException(deckCardInfo, deckCardLists.getName());
}