mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-20 12:48:00 +00:00
Merge branch 'master' into 'master'
Try-catch in ItemManager to catch odd NPE flukes in mobile deck editor (as recommended by Kev) See merge request core-developers/forge!5794
This commit is contained in:
@@ -528,13 +528,17 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
|
||||
if (pool == null) {
|
||||
return;
|
||||
}
|
||||
pool.add(item, qty);
|
||||
if (isUnfiltered()) {
|
||||
model.addItem(item, qty);
|
||||
try {
|
||||
pool.add(item, qty);
|
||||
if (isUnfiltered()) {
|
||||
model.addItem(item, qty);
|
||||
}
|
||||
List<T> items = new ArrayList<>();
|
||||
items.add(item);
|
||||
updateView(false, items);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
List<T> items = new ArrayList<>();
|
||||
items.add(item);
|
||||
updateView(false, items);
|
||||
}
|
||||
|
||||
public void addItems(Iterable<Entry<T, Integer>> itemsToAdd) {
|
||||
|
||||
Reference in New Issue
Block a user