diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index 64ad2a362a8..71d52415e7d 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -554,6 +554,11 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont return singleChosen == null ? CardCollection.EMPTY : new CardCollection(singleChosen); } + final CardCollection choices = new CardCollection(); + if (sourceList.isEmpty()) { + return choices; + } + getGui().setPanelSelection(CardView.get(sa.getHostCard())); if (useSelectCardsInput(sourceList)) { @@ -571,7 +576,6 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont List views = getGui().many(title, localizer.getMessage("lblChosenCards"), min, max, gameCachechoose.getTrackableKeys(), CardView.get(sa.getHostCard())); endTempShowCards(); - final CardCollection choices = new CardCollection(); gameCachechoose.addToList(views, choices); return choices; }