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:
Michael Kamensky
2021-11-11 05:13:27 +00:00

View File

@@ -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) {