diff --git a/Mage.Sets/src/mage/sets/conflux/PathToExile.java b/Mage.Sets/src/mage/sets/conflux/PathToExile.java index da0ce75064..b025525fb2 100644 --- a/Mage.Sets/src/mage/sets/conflux/PathToExile.java +++ b/Mage.Sets/src/mage/sets/conflux/PathToExile.java @@ -29,19 +29,18 @@ package mage.sets.conflux; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Rarity; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.filter.common.FilterBasicLandCard; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; - import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetCreaturePermanent; @@ -96,11 +95,7 @@ class PathToExileEffect extends OneShotEffect { if (player.searchLibrary(target, game)) { Card card = player.getLibrary().getCard(target.getFirstTarget(), game); if (card != null) { - if (card.putOntoBattlefield(game, Zone.LIBRARY, source.getId(), permanent.getControllerId())) { - Permanent land = game.getPermanent(card.getId()); - if (land != null) - land.setTapped(true); - } + card.putOntoBattlefield(game, Zone.LIBRARY, source.getId(), permanent.getControllerId(), true); } } player.shuffleLibrary(game); @@ -111,4 +106,4 @@ class PathToExileEffect extends OneShotEffect { return false; } -} \ No newline at end of file +} diff --git a/Mage/src/mage/abilities/dynamicvalue/common/CountersCount.java b/Mage/src/mage/abilities/dynamicvalue/common/CountersCount.java index 61f696da69..4cb70d10f0 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/CountersCount.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/CountersCount.java @@ -25,8 +25,9 @@ public class CountersCount implements DynamicValue { // if permanent already leaves the battlefield, try to find counters count via last known information if (p == null) { MageObject o = game.getLastKnownInformation(sourceAbility.getSourceId(), Zone.BATTLEFIELD); - if (o instanceof Permanent) + if (o instanceof Permanent) { p = (Permanent) o; + } } if (p != null) { return p.getCounters().getCount(counter); diff --git a/Mage/src/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java b/Mage/src/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java index 3a6558e908..5eb457563a 100644 --- a/Mage/src/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java +++ b/Mage/src/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java @@ -28,19 +28,17 @@ package mage.abilities.effects.common.search; -import mage.constants.Outcome; -import mage.constants.Zone; +import java.util.List; +import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.SearchEffect; import mage.cards.Card; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; -import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInLibrary; -import java.util.List; -import java.util.UUID; - /** * * @author BetaSteward_at_googlemail.com @@ -87,8 +85,9 @@ public class SearchLibraryPutInPlayEffect extends SearchEffect 0) { for (UUID cardId: (List)target.getTargets()) { @@ -101,8 +100,9 @@ public class SearchLibraryPutInPlayEffect extends SearchEffect