From 22d8a4ab36e81e6233b454a2ad73daf018a262f4 Mon Sep 17 00:00:00 2001 From: Danny Plenge Date: Tue, 20 Mar 2018 12:13:11 +0100 Subject: [PATCH] Refactored method in NaturesWill to not always return same value. --- Mage.Sets/src/mage/cards/n/NaturesWill.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/Mage.Sets/src/mage/cards/n/NaturesWill.java b/Mage.Sets/src/mage/cards/n/NaturesWill.java index 215999aa9be..c6a2e8bbc06 100644 --- a/Mage.Sets/src/mage/cards/n/NaturesWill.java +++ b/Mage.Sets/src/mage/cards/n/NaturesWill.java @@ -84,19 +84,16 @@ class NaturesWillEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Set damagedPlayers = (HashSet) this.getValue("damagedPlayers"); - if (damagedPlayers == null) { - return false; - } - - List lands = game.getBattlefield().getActivePermanents(StaticFilters.FILTER_LAND, source.getControllerId(), source.getSourceId(), game); - for (Permanent land : lands) { - if (damagedPlayers.contains(land.getControllerId())) { - land.tap(game); - } else if (land.getControllerId().equals(source.getControllerId())) { - land.untap(game); + if (damagedPlayers != null) { + List lands = game.getBattlefield().getActivePermanents(StaticFilters.FILTER_LAND, source.getControllerId(), source.getSourceId(), game); + for (Permanent land : lands) { + if (damagedPlayers.contains(land.getControllerId())) { + land.tap(game); + } else if (land.getControllerId().equals(source.getControllerId())) { + land.untap(game); + } } } - return false; } }