From cb325996c9710c9fb2de406064ae5057782d5fca Mon Sep 17 00:00:00 2001 From: kevlahnota Date: Mon, 16 Sep 2024 13:34:48 +0800 Subject: [PATCH] prevent NPE --- forge-gui-mobile/src/forge/itemmanager/views/ImageView.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java index 435d6375790..789c68d2a86 100644 --- a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java +++ b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java @@ -431,10 +431,12 @@ public class ImageView extends ItemView { Map, Pile> piles = new TreeMap<>(); for (ItemInfo itemInfo : group.items) { Comparable key = groupPileBy.fnSort.apply(itemInfo); - if (!piles.containsKey(key)) { + if (key != null && !piles.containsKey(key)) { piles.put(key, new Pile()); } - piles.get(key).items.add(itemInfo); + Pile p = key == null ? null : piles.getOrDefault(key, null); + if (p != null) + p.items.add(itemInfo); } group.piles.clear(); group.piles.addAll(piles.values());