From 1d443b231c9eb106d5c913a3c50dcaca3be218b3 Mon Sep 17 00:00:00 2001 From: jeffwadsworth Date: Wed, 28 Jul 2021 16:45:32 -0500 Subject: [PATCH] - Fixed #8038 --- Mage.Sets/src/mage/cards/e/EmissaryOfGrudges.java | 6 +++--- .../effects/common/ChooseSecretOpponentEffect.java | 9 ++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Mage.Sets/src/mage/cards/e/EmissaryOfGrudges.java b/Mage.Sets/src/mage/cards/e/EmissaryOfGrudges.java index 80d2d256f4..dc1998f152 100644 --- a/Mage.Sets/src/mage/cards/e/EmissaryOfGrudges.java +++ b/Mage.Sets/src/mage/cards/e/EmissaryOfGrudges.java @@ -65,8 +65,8 @@ class EmissaryOfGrudgesEffect extends OneShotEffect { public EmissaryOfGrudgesEffect() { super(Outcome.Neutral); - this.staticText = "Choose new targets for target spell or ability if it's controlled by the chosen player and" + - " if it targets you or a permanent you control. Activate only once."; + this.staticText = "Choose new targets for target spell or ability if it's controlled by the chosen player and" + + " if it targets you or a permanent you control. Activate only once."; } public EmissaryOfGrudgesEffect(final EmissaryOfGrudgesEffect effect) { @@ -105,6 +105,6 @@ class EmissaryOfGrudgesEffect extends OneShotEffect { if (targetsYouOrAPermanentYouControl) { return stackObject.chooseNewTargets(game, source.getControllerId(), false, false, null); } - return true; + return false; } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/ChooseSecretOpponentEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ChooseSecretOpponentEffect.java index e85b9ec707..7fedba1981 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ChooseSecretOpponentEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ChooseSecretOpponentEffect.java @@ -78,10 +78,13 @@ public class ChooseSecretOpponentEffect extends OneShotEffect { } private static String getthing(Ability source, Game game) { - if (game.getState().getZone(source.getSourceId()) == Zone.BATTLEFIELD) { - return "" + source.getSourceId() + '_' + source.getSourceObjectZoneChangeCounter(); + if (game.getPermanentEntering(source.getSourceId()) != null) { // Emissary of Grudges and Guardian Archon + return "" + source.getSourceId() + '_' + (game.getPermanentEntering(source.getSourceId()).getZoneChangeCounter(game) + 1); } - return "" + source.getSourceId() + '_' + (source.getSourceObjectZoneChangeCounter() + 1); + if (game.getPermanentOrLKIBattlefield(source.getSourceId()) != null) { // Stalking Leonin + return "" + source.getSourceId() + '_' + (game.getPermanentOrLKIBattlefield(source.getSourceId()).getZoneChangeCounter(game)); + } + return "Does not exist"; } @Override