diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/MerchantRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/MerchantRequestHandler.java index 0144dd3bb..b841d3fb8 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/MerchantRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/MerchantRequestHandler.java @@ -115,7 +115,7 @@ public class MerchantRequestHandler extends LotroServerRequestHandler implements CardCollection collection = _collectionsManager.getPlayerCollection(resourceOwner, CollectionType.MY_CARDS.getCode()); - Set cardItems = new HashSet(); + Set cardItems = new HashSet<>(); if (ownedMin <= 0) { cardItems.addAll(_merchantService.getSellableItems()); final Iterable items = collection.getAll(); @@ -124,11 +124,11 @@ public class MerchantRequestHandler extends LotroServerRequestHandler implements } else { for (CardCollection.Item item : collection.getAll()) { if (item.getCount() >= ownedMin) - cardItems.add(item); + cardItems.add(new BasicCardItem(item.getBlueprintId())); } } - List filteredResult = _sortAndFilterCards.process(filter, cardItems, _library, _formatLibrary, _rarities); + List filteredResult = _sortAndFilterCards.process(filter, cardItems, _library, _formatLibrary, _rarities); List pageToDisplay = new ArrayList(); for (int i = start; i < start + count; i++) {