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

Merge branch 'master' into 'master'

Browse Source 
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:
Michael Kamensky
2021-11-11 05:13:27 +00:00
parent 3b9ab85b7d e9b329523e
commit a336fa5774
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-mobile/src/forge/itemmanager/ItemManager.java
View File

@@ -528,6 +528,7 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
if (pool == null) { if (pool == null) {
return; return;
} }
try {
pool.add(item, qty); pool.add(item, qty);
if (isUnfiltered()) { if (isUnfiltered()) {
model.addItem(item, qty); model.addItem(item, qty);
@@ -535,6 +536,9 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
List<T> items = new ArrayList<>(); List<T> items = new ArrayList<>();
items.add(item); items.add(item);
updateView(false, items); updateView(false, items);
} catch (Exception e) {
e.printStackTrace();
}
} }
public void addItems(Iterable<Entry<T, Integer>> itemsToAdd) { public void addItems(Iterable<Entry<T, Integer>> itemsToAdd) {