From 832f1ebcd728ec9c7cb9a529bd41ca0513321104 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 21 Jun 2020 11:30:30 +0200 Subject: [PATCH] * Snickering Squirrel - Improved choice dialog text. --- Mage.Sets/src/mage/cards/s/SnickeringSquirrel.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Mage.Sets/src/mage/cards/s/SnickeringSquirrel.java b/Mage.Sets/src/mage/cards/s/SnickeringSquirrel.java index bc72bae2dd4..8cce1e89f7d 100644 --- a/Mage.Sets/src/mage/cards/s/SnickeringSquirrel.java +++ b/Mage.Sets/src/mage/cards/s/SnickeringSquirrel.java @@ -1,4 +1,3 @@ - package mage.cards.s; import java.util.UUID; @@ -55,11 +54,13 @@ class SnickeringSquirrelEffect extends ReplacementEffectImpl { @Override public boolean replaceEvent(GameEvent event, Ability source, Game game) { Player controller = game.getPlayer(source.getControllerId()); - - if (controller != null) { + Player dieRoller = game.getPlayer(event.getPlayerId()); + if (controller != null && dieRoller != null) { Permanent permanent = game.getPermanent(source.getSourceId()); - if (permanent != null && permanent.canTap() && !permanent.isTapped()) { - if (controller.chooseUse(Outcome.AIDontUseIt, "Do you want to tap this to increase the result of a die any player rolled by 1?", null, "Yes", "No", source, game)) { + if (permanent != null && !permanent.isTapped()) { + if (controller.chooseUse(Outcome.AIDontUseIt, "Do you want to tap this to increase the result of a die (" + + event.getAmount() + ") " + + dieRoller.getName() + " rolled by 1?", null, "Yes", "No", source, game)) { permanent.tap(game); // ignore planar dies (dice roll amount of planar dies is equal to 0) if (event.getAmount() > 0) {