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

* GUI: fixed that cast/played card can be visible in hand zone until end of the game or re-connect (#7297);

Browse source
This commit is contained in:
Oleg Agafonov 2020-12-27 01:39:00 +04:00
parent 767644f1c8
commit fed97c040a
1 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,10 +1,3 @@
/*
* Cards.java
*
* Created on Dec 18, 2009, 10:40:12 AM
*/
package mage.client.cards; package mage.client.cards;
import mage.cards.MageCard; import mage.cards.MageCard;
@ -122,15 +115,8 @@
public boolean loadCards(CardsView cardsView, BigCard bigCard, UUID gameId, boolean revertOrder) { public boolean loadCards(CardsView cardsView, BigCard bigCard, UUID gameId, boolean revertOrder) {
boolean changed = false; boolean changed = false;
// remove objects no longer on the stack from display // remove objects no longer to display
for (Iterator<Entry<UUID, MageCard>> i = cards.entrySet().iterator(); i.hasNext(); ) { changed = removeOutdatedCards(cardsView);
Entry<UUID, MageCard> entry = i.next();
if (!cardsView.containsKey(entry.getKey())) {
removeCard(entry.getKey());
i.remove();
changed = true;
}
}
// Workaround for bug leaving display of objects on the stack (issue #213 https://github.com/magefree/mage/issues/213) // Workaround for bug leaving display of objects on the stack (issue #213 https://github.com/magefree/mage/issues/213)
if (cardsView.isEmpty() && countCards() > 0) { if (cardsView.isEmpty() && countCards() > 0) {
@ -254,18 +240,29 @@
card.setLocation(dx, (int) card.getLocation().getY()); card.setLocation(dx, (int) card.getLocation().getY());
} }
private void removeCard(UUID cardId) { private boolean removeOutdatedCards(CardsView cardsView) {
boolean changed = false;
// components
for (Component comp : cardArea.getComponents()) { for (Component comp : cardArea.getComponents()) {
UUID cardId = null;
if (comp instanceof Card) { if (comp instanceof Card) {
if (((Card) comp).getCardId().equals(cardId)) { cardId = ((Card) comp).getCardId();
cardArea.remove(comp);
}
} else if (comp instanceof MageCard) { } else if (comp instanceof MageCard) {
if (((MageCard) comp).getOriginal().getId().equals(cardId)) { cardId = ((MageCard) comp).getOriginal().getId();
cardArea.remove(comp); } else {
} LOGGER.error("Unknown card conponent in cards panel to remove: " + comp);
}
if (cardId == null || !cardsView.containsKey(cardId)) {
cardArea.remove(comp);
changed = true;
} }
} }
// links
cards.keySet().removeIf(id -> !cardsView.containsKey(id));
return changed;
} }
private int countCards() { private int countCards() {