Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

* Graveyard window - Fixed that the displayed card order was sometimes mismatched.

Browse source
This commit is contained in:
LevelX2 2015-12-25 17:43:10 +01:00
parent dcfb593059
commit 7c00e4b16d
5 changed files with 57 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Mage.Client/src/main/java/mage/client/cards/Cards.java
View file

@ -134,10 +134,10 @@ public class Cards extends javax.swing.JPanel {
}
public boolean loadCards(SimpleCardsView cardsView, BigCard bigCard, UUID gameId) {
return loadCards(CardsViewUtil.convertSimple(cardsView), bigCard, gameId, null);
return loadCards(CardsViewUtil.convertSimple(cardsView), bigCard, gameId, true);
}
public boolean loadCards(CardsView cardsView, BigCard bigCard, UUID gameId, java.util.List<UUID> order) {
public boolean loadCards(CardsView cardsView, BigCard bigCard, UUID gameId, boolean revertOrder) {
boolean changed = false;
// remove objects no longer on the stack from display
@ -168,10 +168,14 @@ public class Cards extends javax.swing.JPanel {
}
}
// order objects for display
java.util.List<CardView> orderedList = new ArrayList<>();
for (CardView card : cardsView.values()) {
orderedList.add(0, card);
if (revertOrder) {
// order objects for display
for (CardView card : cardsView.values()) {
orderedList.add(0, card);
}
} else {
orderedList.addAll(cardsView.values());
}
// add objects to the panel