diff --git a/Mage.Sets/src/mage/sets/ravnika/BreathOfFury.java b/Mage.Sets/src/mage/sets/ravnika/BreathOfFury.java index 9a77b764fc..9c49603f81 100644 --- a/Mage.Sets/src/mage/sets/ravnika/BreathOfFury.java +++ b/Mage.Sets/src/mage/sets/ravnika/BreathOfFury.java @@ -49,9 +49,7 @@ import mage.target.Target; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.turn.TurnMod; import mage.constants.TurnPhase; -import mage.MageObject; -import mage.filter.predicate.Predicate; - +import mage.filter.predicate.permanent.CanBeEnchantedByPredicate; /** * @author duncancmt */ @@ -142,7 +140,7 @@ class BreathOfFuryEffect extends OneShotEffect { Permanent enchantedCreature = game.getPermanent(enchantment.getAttachedTo()); Player controller = game.getPlayer(source.getControllerId()); FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature you control that could be enchanted by " + enchantment.getName()); - filter.add(new CanBeEnchantedPredicate(enchantment)); + filter.add(new CanBeEnchantedByPredicate(enchantment)); Target target = new TargetControlledCreaturePermanent(filter); target.setNotTarget(true); // It's important to check that the creature was successfully sacrificed here. Effects that prevent sacrifice will also prevent Breath of Fury's effect from working. @@ -165,22 +163,3 @@ class BreathOfFuryEffect extends OneShotEffect { return false; } } - -class CanBeEnchantedPredicate implements Predicate { - - private final MageObject auraEnchantment; - - public CanBeEnchantedPredicate(MageObject auraEnchantment){ - this.auraEnchantment = auraEnchantment; - } - - @Override - public boolean apply(Permanent input, Game game) { - return !input.cantBeEnchantedBy(auraEnchantment, game); - } - - @Override - public String toString() { - return "CanBeEnchanted(" + auraEnchantment.toString() + ")"; - } -} diff --git a/Mage/src/mage/filter/predicate/permanent/CanBeEnchantedByPredicate.java b/Mage/src/mage/filter/predicate/permanent/CanBeEnchantedByPredicate.java new file mode 100644 index 0000000000..f11f4354bf --- /dev/null +++ b/Mage/src/mage/filter/predicate/permanent/CanBeEnchantedByPredicate.java @@ -0,0 +1,55 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.filter.predicate.permanent; + +import mage.MageObject; +import mage.filter.predicate.Predicate; +import mage.game.Game; +import mage.game.permanent.Permanent; + +/** + * @author duncancmt + */ +public class CanBeEnchantedByPredicate implements Predicate { + + private final MageObject auraEnchantment; + + public CanBeEnchantedByPredicate(MageObject auraEnchantment){ + this.auraEnchantment = auraEnchantment; + } + + @Override + public boolean apply(Permanent input, Game game) { + return !input.cantBeEnchantedBy(auraEnchantment, game); + } + + @Override + public String toString() { + return "CanBeEnchanted(" + auraEnchantment.toString() + ")"; + } +}