github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 03:00:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed #8038

Browse source
This commit is contained in:
jeffwadsworth 2021-07-28 16:45:32 -05:00
parent 7326f72222
commit 1d443b231c
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Mage.Sets/src/mage/cards/e/EmissaryOfGrudges.java
View file

@ -65,8 +65,8 @@ class EmissaryOfGrudgesEffect extends OneShotEffect {
public EmissaryOfGrudgesEffect() { public EmissaryOfGrudgesEffect() {
super(Outcome.Neutral); super(Outcome.Neutral);
this.staticText = "Choose new targets for target spell or ability if it's controlled by the chosen player and" + 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."; + " if it targets you or a permanent you control. Activate only once.";
} }
public EmissaryOfGrudgesEffect(final EmissaryOfGrudgesEffect effect) { public EmissaryOfGrudgesEffect(final EmissaryOfGrudgesEffect effect) {
@ -105,6 +105,6 @@ class EmissaryOfGrudgesEffect extends OneShotEffect {
if (targetsYouOrAPermanentYouControl) { if (targetsYouOrAPermanentYouControl) {
return stackObject.chooseNewTargets(game, source.getControllerId(), false, false, null); return stackObject.chooseNewTargets(game, source.getControllerId(), false, false, null);
} }
return true; return false;
} }
} }

9
Mage/src/main/java/mage/abilities/effects/common/ChooseSecretOpponentEffect.java
View file

@ -78,10 +78,13 @@ public class ChooseSecretOpponentEffect extends OneShotEffect {
} }
private static String getthing(Ability source, Game game) { private static String getthing(Ability source, Game game) {
if (game.getState().getZone(source.getSourceId()) == Zone.BATTLEFIELD) { if (game.getPermanentEntering(source.getSourceId()) != null) { // Emissary of Grudges and Guardian Archon
return "" + source.getSourceId() + '_' + source.getSourceObjectZoneChangeCounter(); 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 @Override