github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-28 19:19:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Collection creation is simplified

Browse source
This commit is contained in:
vyacheslav.raskulin 2020-09-09 15:03:01 +03:00
parent 7da043afd0
commit 8b31333d9d
5 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Mage.Client/src/main/java/mage/client/deck/generator/DeckGeneratorPool.java
View file

@ -311,8 +311,7 @@ public class DeckGeneratorPool
*/ */
public Deck getDeck() { public Deck getDeck() {
Set<Card> actualDeck = deck.getCards(); Set<Card> actualDeck = deck.getCards();
for(Card card : deckCards) actualDeck.addAll(deckCards);
actualDeck.add(card);
return deck; return deck;
} }

4
Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
View file

@ -205,9 +205,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
this.btnExpansionSearch.setVisible(false); this.btnExpansionSearch.setVisible(false);
this.limited = true; this.limited = true;
this.cards.clear(); this.cards.clear();
for (Card card : sideboard) { this.cards.addAll(sideboard);
this.cards.add(card);
}
filterCards(); filterCards();
} }

4
Mage.Client/src/main/java/mage/client/table/TournamentMatchesTableModel.java
View file

@ -22,9 +22,7 @@ public class TournamentMatchesTableModel extends AbstractTableModel {
List<TournamentGameView> views = new ArrayList<>(); List<TournamentGameView> views = new ArrayList<>();
watchingAllowed = tournament.isWatchingAllowed(); watchingAllowed = tournament.isWatchingAllowed();
for (RoundView round : tournament.getRounds()) { for (RoundView round : tournament.getRounds()) {
for (TournamentGameView game : round.getGames()) { views.addAll(round.getGames());
views.add(game);
}
} }
games = views.toArray(new TournamentGameView[0]); games = views.toArray(new TournamentGameView[0]);
this.fireTableDataChanged(); this.fireTableDataChanged();

3
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/CopyPasteImageSource.java
View file

@ -232,12 +232,11 @@ public enum CopyPasteImageSource implements CardImageSource {
@Override @Override
public List<String> getSupportedSets() { public List<String> getSupportedSets() {
setupLinks(); setupLinks();
List<String> supportedSetsCopy = new ArrayList<>();
if (supportedSets.isEmpty()) { if (supportedSets.isEmpty()) {
supportedSets.addAll(Sets.getInstance().keySet()); supportedSets.addAll(Sets.getInstance().keySet());
} }
supportedSetsCopy.addAll(supportedSets); List<String> supportedSetsCopy = new ArrayList<>(supportedSets);
return supportedSetsCopy; return supportedSetsCopy;
} }

3
Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java
View file

@ -58,8 +58,7 @@ public enum ServerMessagesUtil {
private void reloadMessages() { private void reloadMessages() {
LOGGER.debug("Reading server messages..."); LOGGER.debug("Reading server messages...");
List<String> motdMessages = readFromFile(); List<String> motdMessages = readFromFile();
List<String> newMessages = new ArrayList<>(); List<String> newMessages = new ArrayList<>(motdMessages);
newMessages.addAll(motdMessages);
newMessages.add(getServerStatistics()); newMessages.add(getServerStatistics());
newMessages.add(getServerStatistics2()); newMessages.add(getServerStatistics2());