From 750a655dcb6a398dbbe1a6c7f66858a230357f18 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Thu, 14 Jun 2018 13:57:13 -0400 Subject: [PATCH] fixed Teferi, Hero of Dominaria allowing players to skip untap --- .../mage/abilities/effects/common/UntapLandsEffect.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/effects/common/UntapLandsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/UntapLandsEffect.java index f650830fb0..ccc695b67b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/UntapLandsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/UntapLandsEffect.java @@ -1,4 +1,3 @@ - package mage.abilities.effects.common; import java.util.UUID; @@ -47,7 +46,12 @@ public class UntapLandsEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - int tappedLands = game.getBattlefield().getAllActivePermanents(filter, controller.getId(), game).size(); + int tappedLands; + if (upTo) { + tappedLands = game.getBattlefield().getAllActivePermanents(filter, controller.getId(), game).size(); + } else { + tappedLands = game.getBattlefield().getAllActivePermanents(filter, game).size(); + } TargetLandPermanent target = new TargetLandPermanent(upTo ? 0 : Math.min(tappedLands, amount), amount, filter, true); if (target.canChoose(source.getSourceId(), source.getControllerId(), game)) {