Fixed NullPointerException in case card wasn't found by name. Fixed CardGrid (didn't removed mage card if card plugin was used)

This commit is contained in:
magenoxx 2010-11-22 16:45:26 +00:00
parent 6e9159f86e
commit b1858396a5
2 changed files with 17 additions and 12 deletions

View file

@ -129,11 +129,11 @@ public class CardGrid extends javax.swing.JLayeredPane implements MouseListener
if (comp instanceof Card) {
if (((Card)comp).getCardId().equals(cardId)) {
remove(comp);
} else if (comp instanceof MageCard) {
if (((MageCard)comp).getOriginal().getId().equals(cardId)) {
remove(comp);
}
}
}
} else if (comp instanceof MageCard) {
if (((MageCard)comp).getOriginal().getId().equals(cardId)) {
remove(comp);
}
}
}
}