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

Merge remote-tracking branch 'origin/AI_ATTACK_TIMEOUT' into AI_ATTACK_TIMEOUT

Browse Source
This commit is contained in:
Anthony Calosa
2024-11-22 12:46:26 +08:00
parent afb062e770 f918ae5978
commit 7c3354cf70
15 changed files with 53 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
View File

@@ -591,10 +591,12 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
Map<Comparable<?>, 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());