external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

- To avoid possibly unexpected behavior, check to ensure that the infinite pool already contains all the items requested.

Browse Source
This commit is contained in:
Agetian
2018-05-09 18:27:00 +03:00
parent 1e1a16a4f4
commit 816660f80d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java
View File

@@ -40,6 +40,7 @@ import javax.swing.event.ListSelectionListener;
import javax.swing.event.PopupMenuEvent;
import javax.swing.event.PopupMenuListener;
import com.google.common.collect.Lists;
import net.miginfocom.swing.MigLayout;
import com.google.common.base.Predicate;
@@ -719,7 +720,7 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel implem
*/
@Override
public void addItem(final T item, final int qty) {
if (this.isInfinite()) {
if (this.isInfinite() && this.model.getOrderedList().contains(item)) {
return;
}
this.pool.add(item, qty);
@@ -739,7 +740,7 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel implem
*/
@Override
public void addItems(final Iterable<Entry<T, Integer>> itemsToAdd) {
if (this.isInfinite()) {
if (this.isInfinite() && this.model.getOrderedList().containsAll(Lists.newArrayList(itemsToAdd))) {
return;
}
this.pool.addAll(itemsToAdd);