Merge branch 'master' into AI_ATTACK_TIMEOUT

.github/workflows/remove-stale-branches.yml

@@ -1,4 +1,7 @@
+name: Remove stale branches
+
 on:
+  workflow_dispatch:
   schedule:
     - cron: "0 0 * * *" # Everday at midnight
 
@@ -9,4 +12,6 @@ jobs:
     steps:
       - uses: fpicalausa/remove-stale-branches@v1.6.0
         with:
-          dry-run: true # Check out the console output before setting this to false
+          dry-run: false # Check out the console output before setting this to false
+          ignore-unknown-authors: true
+          default-recipient: tehdiplomat

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

@@ -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());

forge-gui-mobile/src/forge/card/CardZoom.java

@@ -377,8 +377,10 @@ public class CardZoom extends FOverlay {
         float x = (w - cardWidth) / 2;
         y = (h - cardHeight) / 2;
         if (zoomMode) {
+            if (currentCard != null)
                 CardImageRenderer.drawZoom(g, currentCard, gameView, showBackSide? showBackSide : showAltState, x, y, cardWidth, cardHeight, getWidth(), getHeight(), true);
         } else {
+            if (currentCard != null)
                 CardImageRenderer.drawDetails(g, currentCard, gameView, showBackSide ? showBackSide : showAltState, x, y, cardWidth, cardHeight);
         }