From fe72ab9192897ddc7a8f5b1ea11bc174a5525696 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 7 Sep 2012 13:34:03 +0200 Subject: [PATCH] Fixed bug that leaves unmodifiable lines for lands in the deck editor. Happens when you add more than one land from the same expansion with quantity > 1 and e.g. pushed new button afterwards. --- .../main/java/mage/client/deckeditor/table/TableModel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java b/Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java index 1e65b646704..2e4c07a5ac9 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java @@ -116,12 +116,12 @@ public class TableModel extends AbstractTableModel implements ICardGrid { } for (int j = 0; j < view.size(); j++) { CardView cv = view.get(j); - if (cv.getId().equals(entry.getKey())) { + if (cv.getId().equals(entry.getValue().getId())) { if (count > 0) { // replace by another card with the same name+setCode - String key1 = cv.getName()+cv.getExpansionSetCode(); + String key1 = cv.getName()+cv.getExpansionSetCode()+cv.getCardNumber(); for (CardView cardView : cards.values()) { - String key2 = cardView.getName()+cardView.getExpansionSetCode(); + String key2 = cardView.getName()+cardView.getExpansionSetCode()+cardView.getCardNumber(); if ((key1).equals(key2)) { view.set(j, cardView); break;