From 4575bd6fda818aaa3be644555d140b8d00eb6dca Mon Sep 17 00:00:00 2001 From: PurpleCrowbar <26198472+PurpleCrowbar@users.noreply.github.com> Date: Wed, 21 Jun 2023 23:28:21 +0100 Subject: [PATCH] Fix Nesting Grounds unnecessarily prompting user to select a counter when only one option present --- Mage.Sets/src/mage/cards/n/NestingGrounds.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Mage.Sets/src/mage/cards/n/NestingGrounds.java b/Mage.Sets/src/mage/cards/n/NestingGrounds.java index b0cf1ede102..4b2c0bd1674 100644 --- a/Mage.Sets/src/mage/cards/n/NestingGrounds.java +++ b/Mage.Sets/src/mage/cards/n/NestingGrounds.java @@ -90,17 +90,23 @@ class NestingGroundsEffect extends OneShotEffect { Permanent toPermanent = game.getPermanent(source.getTargets().get(1).getFirstTarget()); if (fromPermanent == null || toPermanent == null - || controller == null) { + || controller == null + || fromPermanent.getCounters(game).size() == 0) { return false; } - Set possibleChoices = new LinkedHashSet<>(fromPermanent.getCounters(game).keySet()); - if (possibleChoices.size() == 0) { - return false; + if (fromPermanent.getCounters(game).size() == 1) { + for (Counter counter : fromPermanent.getCounters(game).values()) { + fromPermanent.removeCounters(counter.getName(), 1, source, game); + toPermanent.addCounters(new Counter(counter.getName()), source.getControllerId(), source, game); + } + return true; } Choice choice = new ChoiceImpl(); + Set possibleChoices = new LinkedHashSet<>(fromPermanent.getCounters(game).keySet()); choice.setChoices(possibleChoices); + choice.setMessage("Choose a counter"); if (controller.choose(outcome, choice, game)) { String chosen = choice.getChoice(); if (fromPermanent.getCounters(game).containsKey(chosen)) {