From c6084934af545ed62a7c78bd9dc26d82ce1676ca Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 29 Aug 2017 10:05:46 +0200 Subject: [PATCH] * War's Toll - Fixed the land tapping effect to only tap the lands of the one opponent that tapped a land for mana. --- Mage.Sets/src/mage/cards/w/WarsToll.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Mage.Sets/src/mage/cards/w/WarsToll.java b/Mage.Sets/src/mage/cards/w/WarsToll.java index d89629b1a09..f9a76d7c045 100644 --- a/Mage.Sets/src/mage/cards/w/WarsToll.java +++ b/Mage.Sets/src/mage/cards/w/WarsToll.java @@ -38,6 +38,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SetTargetPointer; import mage.constants.TargetController; +import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; @@ -99,12 +100,13 @@ class WarsTollTapEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); - filter.add(new ControllerIdPredicate(getTargetPointer().getFirst(game, source))); - for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { - permanent.tap(game); + if (getTargetPointer().getFirst(game, source) != null) { + for (Permanent permanent : game.getBattlefield().getAllActivePermanents(StaticFilters.FILTER_LAND, getTargetPointer().getFirst(game, source), game)) { + permanent.tap(game); + } + return true; } - return true; + return false; } }