diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Choice.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Choice.java index bcf6af2c6..581cebb03 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Choice.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Choice.java @@ -53,6 +53,11 @@ public class Choice implements EffectAppenderProducer { textIndex++; } + if (playableEffectAppenders.size() == 0) { + actionContext.setValueToMemory(memorize, ""); + return null; + } + if (playableEffectAppenders.size() == 1) { SubAction subAction = new SubAction(action); playableEffectAppenders.get(0).appendEffect(cost, subAction, delegateActionContext); @@ -60,16 +65,6 @@ public class Choice implements EffectAppenderProducer { return new StackActionEffect(subAction); } - if (playableEffectAppenders.isEmpty()) { - actionContext.setValueToMemory(memorize, ""); - textIndex = 0; - for (EffectAppender possibleEffectAppender : possibleEffectAppenders) { - playableEffectAppenders.add(possibleEffectAppender); - effectTexts.add(GameUtils.substituteText(textArray[textIndex], actionContext)); - textIndex++; - } - } - SubAction subAction = new SubAction(action); subAction.appendCost( new PlayoutDecisionEffect(choosingPlayer,