diff --git a/Mage.Sets/src/mage/cards/a/AminatouTheFateshifter.java b/Mage.Sets/src/mage/cards/a/AminatouTheFateshifter.java index b9a89f87e3f..c2226fb5eb1 100644 --- a/Mage.Sets/src/mage/cards/a/AminatouTheFateshifter.java +++ b/Mage.Sets/src/mage/cards/a/AminatouTheFateshifter.java @@ -17,7 +17,6 @@ import mage.choices.ChoiceLeftOrRight; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; @@ -39,7 +38,7 @@ public class AminatouTheFateshifter extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("permanent you own"); static { - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/a/AshiokNightmareMuse.java b/Mage.Sets/src/mage/cards/a/AshiokNightmareMuse.java index 71dbffd254d..fef376a7693 100644 --- a/Mage.Sets/src/mage/cards/a/AshiokNightmareMuse.java +++ b/Mage.Sets/src/mage/cards/a/AshiokNightmareMuse.java @@ -9,7 +9,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; -import mage.filter.predicate.other.OwnerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.AshiokNightmareMuseToken; @@ -19,7 +18,7 @@ import mage.target.common.TargetCardInHand; import mage.target.common.TargetNonlandPermanent; import java.util.UUID; -import mage.MageObject; + import mage.MageObjectReference; import mage.cards.Card; @@ -98,7 +97,7 @@ class AshiokNightmareMuseCastEffect extends OneShotEffect { private static final FilterCard filter = new FilterCard("face-up cards your opponents own from exile"); static { - filter.add(new OwnerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getOwnerPredicate()); } AshiokNightmareMuseCastEffect() { diff --git a/Mage.Sets/src/mage/cards/a/AthreosGodOfPassage.java b/Mage.Sets/src/mage/cards/a/AthreosGodOfPassage.java index 94e9d1d7831..819a800165d 100644 --- a/Mage.Sets/src/mage/cards/a/AthreosGodOfPassage.java +++ b/Mage.Sets/src/mage/cards/a/AthreosGodOfPassage.java @@ -16,7 +16,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -36,7 +35,7 @@ public final class AthreosGodOfPassage extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); } public AthreosGodOfPassage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BlightHerder.java b/Mage.Sets/src/mage/cards/b/BlightHerder.java index 598dc52a20e..29c86049b11 100644 --- a/Mage.Sets/src/mage/cards/b/BlightHerder.java +++ b/Mage.Sets/src/mage/cards/b/BlightHerder.java @@ -13,7 +13,6 @@ import mage.cards.Cards; import mage.cards.CardsImpl; import mage.constants.*; import mage.filter.FilterCard; -import mage.filter.predicate.other.OwnerPredicate; import mage.game.Game; import mage.game.permanent.token.EldraziScionToken; import mage.players.Player; @@ -51,7 +50,7 @@ class BlightHerderEffect extends OneShotEffect { private static final FilterCard filter = new FilterCard("cards your opponents own from exile"); static { - filter.add(new OwnerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getOwnerPredicate()); } public BlightHerderEffect() { diff --git a/Mage.Sets/src/mage/cards/b/Brand.java b/Mage.Sets/src/mage/cards/b/Brand.java index 4b80514ccad..190310a1fe0 100644 --- a/Mage.Sets/src/mage/cards/b/Brand.java +++ b/Mage.Sets/src/mage/cards/b/Brand.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.other.OwnerPredicate; /** * @@ -21,7 +20,7 @@ public final class Brand extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("all permanents you own"); static { - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); } public Brand(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BridgeFromBelow.java b/Mage.Sets/src/mage/cards/b/BridgeFromBelow.java index f442083da90..d810f8108d9 100644 --- a/Mage.Sets/src/mage/cards/b/BridgeFromBelow.java +++ b/Mage.Sets/src/mage/cards/b/BridgeFromBelow.java @@ -12,7 +12,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -31,9 +30,9 @@ public final class BridgeFromBelow extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("When a creature is put into an opponent's graveyard from the battlefield"); static { - filter1.add(new OwnerPredicate(TargetController.YOU)); + filter1.add(TargetController.YOU.getOwnerPredicate()); filter1.add(Predicates.not(TokenPredicate.instance)); - filter2.add(new OwnerPredicate(TargetController.OPPONENT)); + filter2.add(TargetController.OPPONENT.getOwnerPredicate()); } public BridgeFromBelow(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CelestialGatekeeper.java b/Mage.Sets/src/mage/cards/c/CelestialGatekeeper.java index 552d39dc32d..4acadb8fc56 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialGatekeeper.java +++ b/Mage.Sets/src/mage/cards/c/CelestialGatekeeper.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.other.OwnerPredicate; import mage.target.common.TargetCardInGraveyard; /** @@ -27,7 +26,7 @@ public final class CelestialGatekeeper extends CardImpl { private static final FilterCard filter = new FilterCard("Bird and/or Cleric permanent cards"); static { - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); filter.add(Predicates.or( SubType.BIRD.getPredicate(), SubType.CLERIC.getPredicate() diff --git a/Mage.Sets/src/mage/cards/c/CharmingPrince.java b/Mage.Sets/src/mage/cards/c/CharmingPrince.java index a1b24192575..1ed2dc9b705 100644 --- a/Mage.Sets/src/mage/cards/c/CharmingPrince.java +++ b/Mage.Sets/src/mage/cards/c/CharmingPrince.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -35,7 +34,7 @@ public final class CharmingPrince extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("another creature you own"); static { - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/c/ConjuredCurrency.java b/Mage.Sets/src/mage/cards/c/ConjuredCurrency.java index 36b7d43bcfc..e6f3c66bef0 100644 --- a/Mage.Sets/src/mage/cards/c/ConjuredCurrency.java +++ b/Mage.Sets/src/mage/cards/c/ConjuredCurrency.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; @@ -23,7 +22,7 @@ public final class ConjuredCurrency extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("permanent you neither own nor control"); static { - filter.add(new OwnerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getOwnerPredicate()); filter.add(new ControllerPredicate(TargetController.NOT_YOU)); } private static final String rule = "you may exchange control of {this} and target permanent you neither own nor control"; diff --git a/Mage.Sets/src/mage/cards/d/DawnbreakReclaimer.java b/Mage.Sets/src/mage/cards/d/DawnbreakReclaimer.java index 1f45bb9d571..679cd815de9 100644 --- a/Mage.Sets/src/mage/cards/d/DawnbreakReclaimer.java +++ b/Mage.Sets/src/mage/cards/d/DawnbreakReclaimer.java @@ -19,7 +19,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.other.OwnerIdPredicate; -import mage.filter.predicate.other.OwnerPredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; @@ -90,7 +89,7 @@ class DawnbreakReclaimerEffect extends OneShotEffect { if (controller != null && sourceObject != null) { FilterCreatureCard filter = new FilterCreatureCard("a creature card in an opponent's graveyard"); - filter.add(new OwnerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getOwnerPredicate()); TargetCard chosenCreatureOpponentGraveyard = new TargetCard(Zone.GRAVEYARD, filter); Player opponent = null; Card cardOpponentGraveyard = null; diff --git a/Mage.Sets/src/mage/cards/d/DecayingSoil.java b/Mage.Sets/src/mage/cards/d/DecayingSoil.java index f41903636a4..6e8c872d77d 100644 --- a/Mage.Sets/src/mage/cards/d/DecayingSoil.java +++ b/Mage.Sets/src/mage/cards/d/DecayingSoil.java @@ -17,7 +17,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -39,7 +38,7 @@ public final class DecayingSoil extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creature"); static { - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); filter.add(Predicates.not(TokenPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/d/DespoticScepter.java b/Mage.Sets/src/mage/cards/d/DespoticScepter.java index d4757705ebc..26fdb0c64b0 100644 --- a/Mage.Sets/src/mage/cards/d/DespoticScepter.java +++ b/Mage.Sets/src/mage/cards/d/DespoticScepter.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.other.OwnerPredicate; import mage.target.TargetPermanent; /** @@ -24,7 +23,7 @@ public final class DespoticScepter extends CardImpl { private static final FilterPermanent FILTER = new FilterPermanent("permanent you own"); static { - FILTER.add(new OwnerPredicate(TargetController.YOU)); + FILTER.add(TargetController.YOU.getOwnerPredicate()); } public DespoticScepter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EmbalmersTools.java b/Mage.Sets/src/mage/cards/e/EmbalmersTools.java index 50d45a90355..bb7c1284c11 100644 --- a/Mage.Sets/src/mage/cards/e/EmbalmersTools.java +++ b/Mage.Sets/src/mage/cards/e/EmbalmersTools.java @@ -17,7 +17,6 @@ import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.players.Player; @@ -66,7 +65,7 @@ class EmbalmersToolsEffect extends CostModificationEffectImpl { private static final FilterCreatureCard filter = new FilterCreatureCard(); static { - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); } public EmbalmersToolsEffect() { diff --git a/Mage.Sets/src/mage/cards/g/GethLordOfTheVault.java b/Mage.Sets/src/mage/cards/g/GethLordOfTheVault.java index a8fd1e165a1..3db2f0e8b7d 100644 --- a/Mage.Sets/src/mage/cards/g/GethLordOfTheVault.java +++ b/Mage.Sets/src/mage/cards/g/GethLordOfTheVault.java @@ -18,7 +18,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.other.OwnerPredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInGraveyard; @@ -32,7 +31,7 @@ public final class GethLordOfTheVault extends CardImpl { private static final FilterCard filter = new FilterCard("artifact or creature card with converted mana cost X from an opponent's graveyard"); static { - filter.add(new OwnerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getOwnerPredicate()); filter.add(Predicates.or( CardType.ARTIFACT.getPredicate(), CardType.CREATURE.getPredicate())); diff --git a/Mage.Sets/src/mage/cards/g/GrimFeast.java b/Mage.Sets/src/mage/cards/g/GrimFeast.java index c2ff28caf22..c3be0ef0f0d 100644 --- a/Mage.Sets/src/mage/cards/g/GrimFeast.java +++ b/Mage.Sets/src/mage/cards/g/GrimFeast.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.OwnerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -51,7 +50,7 @@ class GrimFeastTriggeredAbility extends PutIntoGraveFromBattlefieldAllTriggeredA private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature"); static { - filter.add(new OwnerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getOwnerPredicate()); } public GrimFeastTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/g/GruulCharm.java b/Mage.Sets/src/mage/cards/g/GruulCharm.java index 592a8760d6e..9091e79c9e3 100644 --- a/Mage.Sets/src/mage/cards/g/GruulCharm.java +++ b/Mage.Sets/src/mage/cards/g/GruulCharm.java @@ -16,7 +16,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.other.OwnerPredicate; /** * @@ -30,7 +29,7 @@ public final class GruulCharm extends CardImpl { static { filter.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); - filter2.add(new OwnerPredicate(TargetController.YOU)); + filter2.add(TargetController.YOU.getOwnerPredicate()); filter3.add(new AbilityPredicate(FlyingAbility.class)); } diff --git a/Mage.Sets/src/mage/cards/h/HakimLoreweaver.java b/Mage.Sets/src/mage/cards/h/HakimLoreweaver.java index b20a1989f3a..56042d82f9c 100644 --- a/Mage.Sets/src/mage/cards/h/HakimLoreweaver.java +++ b/Mage.Sets/src/mage/cards/h/HakimLoreweaver.java @@ -19,7 +19,6 @@ import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardIdPredicate; import mage.filter.predicate.other.AuraCardCanAttachToPermanentId; -import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.AttachedToPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -40,7 +39,7 @@ public final class HakimLoreweaver extends CardImpl { static { filter.add(CardType.ENCHANTMENT.getPredicate()); filter.add(SubType.AURA.getPredicate()); - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); } public HakimLoreweaver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HannaShipsNavigator.java b/Mage.Sets/src/mage/cards/h/HannaShipsNavigator.java index c12a3118ff1..64a3170891d 100644 --- a/Mage.Sets/src/mage/cards/h/HannaShipsNavigator.java +++ b/Mage.Sets/src/mage/cards/h/HannaShipsNavigator.java @@ -17,7 +17,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.other.OwnerPredicate; import mage.target.common.TargetCardInYourGraveyard; /** @@ -30,7 +29,7 @@ public final class HannaShipsNavigator extends CardImpl { static { filter.add(Predicates.or(CardType.ARTIFACT.getPredicate(), CardType.ENCHANTMENT.getPredicate())); - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); } public HannaShipsNavigator(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HedronAlignment.java b/Mage.Sets/src/mage/cards/h/HedronAlignment.java index 15cc1101d32..2468d05c77c 100644 --- a/Mage.Sets/src/mage/cards/h/HedronAlignment.java +++ b/Mage.Sets/src/mage/cards/h/HedronAlignment.java @@ -21,7 +21,6 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.other.OwnerPredicate; import mage.game.Game; import mage.players.Player; @@ -59,9 +58,9 @@ class HedronAlignmentEffect extends OneShotEffect { static { filterPermanent.add(new NamePredicate("Hedron Alignment")); - filterPermanent.add(new OwnerPredicate(TargetController.YOU)); + filterPermanent.add(TargetController.YOU.getOwnerPredicate()); filterCard.add(new NamePredicate("Hedron Alignment")); - filterCard.add(new OwnerPredicate(TargetController.YOU)); + filterCard.add(TargetController.YOU.getOwnerPredicate()); } public HedronAlignmentEffect() { diff --git a/Mage.Sets/src/mage/cards/h/HeraldOfLeshrac.java b/Mage.Sets/src/mage/cards/h/HeraldOfLeshrac.java index 6a5f91566ec..3d226e3a9a4 100644 --- a/Mage.Sets/src/mage/cards/h/HeraldOfLeshrac.java +++ b/Mage.Sets/src/mage/cards/h/HeraldOfLeshrac.java @@ -27,7 +27,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.other.OwnerIdPredicate; -import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; @@ -44,7 +43,7 @@ public final class HeraldOfLeshrac extends CardImpl { private static final FilterPermanent filter = new FilterControlledLandPermanent("land you control but don't own"); static { - filter.add(new OwnerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getOwnerPredicate()); } public HeraldOfLeshrac(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JhoirasTimebug.java b/Mage.Sets/src/mage/cards/j/JhoirasTimebug.java index ac831d397e7..3d03daab51a 100644 --- a/Mage.Sets/src/mage/cards/j/JhoirasTimebug.java +++ b/Mage.Sets/src/mage/cards/j/JhoirasTimebug.java @@ -17,7 +17,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterPermanentOrSuspendedCard; -import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -33,7 +32,7 @@ public final class JhoirasTimebug extends CardImpl { private static final FilterPermanentOrSuspendedCard filter = new FilterPermanentOrSuspendedCard("permanent you control or suspended card you own"); static { filter.getPermanentFilter().add(new ControllerPredicate(TargetController.YOU)); - filter.getCardFilter().add(new OwnerPredicate(TargetController.YOU)); + filter.getCardFilter().add(TargetController.YOU.getOwnerPredicate()); } public JhoirasTimebug(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KothophedSoulHoarder.java b/Mage.Sets/src/mage/cards/k/KothophedSoulHoarder.java index 2b3d30d85f8..06362ab4b41 100644 --- a/Mage.Sets/src/mage/cards/k/KothophedSoulHoarder.java +++ b/Mage.Sets/src/mage/cards/k/KothophedSoulHoarder.java @@ -19,7 +19,6 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.other.OwnerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -34,7 +33,7 @@ public final class KothophedSoulHoarder extends CardImpl { private static final FilterPermanent filter = new FilterPermanent(); static { - filter.add(new OwnerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getOwnerPredicate()); } public KothophedSoulHoarder(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LeaveChance.java b/Mage.Sets/src/mage/cards/l/LeaveChance.java index 366f9ea9014..262a76dc986 100644 --- a/Mage.Sets/src/mage/cards/l/LeaveChance.java +++ b/Mage.Sets/src/mage/cards/l/LeaveChance.java @@ -7,7 +7,6 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.keyword.AftermathAbility; import mage.cards.Card; -import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.Cards; import mage.cards.SplitCard; @@ -17,7 +16,6 @@ import mage.constants.SpellAbilityType; import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.FilterPermanent; -import mage.filter.predicate.other.OwnerPredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; @@ -35,7 +33,7 @@ public final class LeaveChance extends SplitCard { // Return any number of target permanents you own to your hand. FilterPermanent filter = new FilterPermanent("permanents you own"); - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); getLeftHalfCard().getSpellAbility().addEffect(new ReturnToHandTargetEffect()); getLeftHalfCard().getSpellAbility().addTarget(new TargetPermanent(0, Integer.MAX_VALUE, filter, false)); diff --git a/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java b/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java index 5a907accc78..4422239cd6e 100644 --- a/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java +++ b/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java @@ -17,7 +17,6 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.other.OwnerPredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; @@ -32,7 +31,7 @@ public final class LinSivviDefiantHero extends CardImpl { private static final FilterCard filter = new FilterCard("Rebel card from your graveyard"); static { - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); filter.add(SubType.REBEL.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/l/LordWindgrace.java b/Mage.Sets/src/mage/cards/l/LordWindgrace.java index 517407e8882..b751835dbf1 100644 --- a/Mage.Sets/src/mage/cards/l/LordWindgrace.java +++ b/Mage.Sets/src/mage/cards/l/LordWindgrace.java @@ -19,7 +19,6 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.filter.common.FilterLandCard; -import mage.filter.predicate.other.OwnerPredicate; import mage.game.Game; import mage.game.permanent.token.CatWarriorToken; import mage.players.Player; @@ -35,7 +34,7 @@ public final class LordWindgrace extends CardImpl { private static final FilterLandCard filter = new FilterLandCard("land cards from your graveyard"); static { - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); } public LordWindgrace(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LurkingSkirge.java b/Mage.Sets/src/mage/cards/l/LurkingSkirge.java index 8829e559b74..8185db4b942 100644 --- a/Mage.Sets/src/mage/cards/l/LurkingSkirge.java +++ b/Mage.Sets/src/mage/cards/l/LurkingSkirge.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.OwnerPredicate; import mage.game.permanent.token.TokenImpl; /** @@ -28,7 +27,7 @@ public final class LurkingSkirge extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new OwnerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getOwnerPredicate()); } public LurkingSkirge(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MythUnbound.java b/Mage.Sets/src/mage/cards/m/MythUnbound.java index cf9ce5e0134..08e62af7f6c 100644 --- a/Mage.Sets/src/mage/cards/m/MythUnbound.java +++ b/Mage.Sets/src/mage/cards/m/MythUnbound.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.CommanderPredicate; import mage.game.Game; import mage.players.Player; @@ -29,7 +28,7 @@ public final class MythUnbound extends CardImpl { static { filter.add(CommanderPredicate.instance); - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); } public MythUnbound(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NamelessRace.java b/Mage.Sets/src/mage/cards/n/NamelessRace.java index eca9d51b5aa..99cfc8958da 100644 --- a/Mage.Sets/src/mage/cards/n/NamelessRace.java +++ b/Mage.Sets/src/mage/cards/n/NamelessRace.java @@ -21,7 +21,6 @@ import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -73,7 +72,7 @@ class NamelessRaceEffect extends OneShotEffect { filter.add(Predicates.not(TokenPredicate.instance)); filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter2.add(new ColorPredicate(ObjectColor.WHITE)); - filter2.add(new OwnerPredicate(TargetController.OPPONENT)); + filter2.add(TargetController.OPPONENT.getOwnerPredicate()); } NamelessRaceEffect() { diff --git a/Mage.Sets/src/mage/cards/o/ObeliskOfUndoing.java b/Mage.Sets/src/mage/cards/o/ObeliskOfUndoing.java index 6aac24e5048..81c8a74f5b5 100644 --- a/Mage.Sets/src/mage/cards/o/ObeliskOfUndoing.java +++ b/Mage.Sets/src/mage/cards/o/ObeliskOfUndoing.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.other.OwnerPredicate; import mage.target.common.TargetControlledPermanent; @@ -26,7 +25,7 @@ public final class ObeliskOfUndoing extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent(); static { - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); } public ObeliskOfUndoing(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianScriptures.java b/Mage.Sets/src/mage/cards/p/PhyrexianScriptures.java index 3e83ce4d964..091fd2ea329 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianScriptures.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianScriptures.java @@ -20,7 +20,6 @@ import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.other.OwnerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -34,7 +33,7 @@ public final class PhyrexianScriptures extends CardImpl { static { filter.add(Predicates.not(CardType.ARTIFACT.getPredicate())); - filter2.add(new OwnerPredicate(TargetController.OPPONENT)); + filter2.add(TargetController.OPPONENT.getOwnerPredicate()); } public PhyrexianScriptures(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PiasRevolution.java b/Mage.Sets/src/mage/cards/p/PiasRevolution.java index b665e8a9225..d5c4454c437 100644 --- a/Mage.Sets/src/mage/cards/p/PiasRevolution.java +++ b/Mage.Sets/src/mage/cards/p/PiasRevolution.java @@ -14,7 +14,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -94,7 +93,7 @@ class PiasRevolutionTriggeredAbility extends TriggeredAbilityImpl { static { filter.add(Predicates.not(TokenPredicate.instance)); - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); } public PiasRevolutionTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/p/PrizedAmalgam.java b/Mage.Sets/src/mage/cards/p/PrizedAmalgam.java index e8c4babc360..9e14e4c9bb6 100644 --- a/Mage.Sets/src/mage/cards/p/PrizedAmalgam.java +++ b/Mage.Sets/src/mage/cards/p/PrizedAmalgam.java @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.OwnerPredicate; import mage.game.Game; import mage.game.events.EntersTheBattlefieldEvent; import mage.game.events.GameEvent; @@ -32,7 +31,7 @@ public final class PrizedAmalgam extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature"); static { - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); } public PrizedAmalgam(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PulsemageAdvocate.java b/Mage.Sets/src/mage/cards/p/PulsemageAdvocate.java index ad272fd4cc4..5567c5fbe1e 100644 --- a/Mage.Sets/src/mage/cards/p/PulsemageAdvocate.java +++ b/Mage.Sets/src/mage/cards/p/PulsemageAdvocate.java @@ -19,7 +19,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.StaticFilters; -import mage.filter.predicate.other.OwnerPredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInASingleGraveyard; @@ -34,7 +33,7 @@ public final class PulsemageAdvocate extends CardImpl { private static final FilterCard filter = new FilterCard("cards from an opponent's graveyard"); static { - filter.add(new OwnerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getOwnerPredicate()); } public PulsemageAdvocate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RealityScramble.java b/Mage.Sets/src/mage/cards/r/RealityScramble.java index 6eeacc43eda..fb911c33703 100644 --- a/Mage.Sets/src/mage/cards/r/RealityScramble.java +++ b/Mage.Sets/src/mage/cards/r/RealityScramble.java @@ -16,7 +16,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.other.OwnerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -32,7 +31,7 @@ public final class RealityScramble extends CardImpl { = new FilterPermanent("permanent you own"); static { - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); } public RealityScramble(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RemoveEnchantments.java b/Mage.Sets/src/mage/cards/r/RemoveEnchantments.java index 7c077c4b15e..534db53d44e 100644 --- a/Mage.Sets/src/mage/cards/r/RemoveEnchantments.java +++ b/Mage.Sets/src/mage/cards/r/RemoveEnchantments.java @@ -13,7 +13,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledEnchantmentPermanent; import mage.filter.predicate.ObjectPlayer; import mage.filter.predicate.ObjectPlayerPredicate; -import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.AttachedToControlledPermanentPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -32,25 +31,25 @@ public final class RemoveEnchantments extends CardImpl { private static final FilterPermanent filter6 = new FilterPermanent(); static { // all enchantments you both own and control - filter1.add(new OwnerPredicate(TargetController.YOU)); + filter1.add(TargetController.YOU.getOwnerPredicate()); // all Auras you own attached to permanents you control filter2.add(new AttachedToControlledPermanentPredicate()); filter2.add(SubType.AURA.getPredicate()); - filter2.add(new OwnerPredicate(TargetController.YOU)); + filter2.add(TargetController.YOU.getOwnerPredicate()); // all Auras you own attached to attacking creatures your opponents control filter3.add(new AttachedToOpponentControlledAttackingCreaturePredicate()); filter3.add(SubType.AURA.getPredicate()); - filter3.add(new OwnerPredicate(TargetController.YOU)); + filter3.add(TargetController.YOU.getOwnerPredicate()); // all other enchantments you control (i.e. that you don't own) - filter4.add(new OwnerPredicate(TargetController.NOT_YOU)); + filter4.add(TargetController.NOT_YOU.getOwnerPredicate()); // all other Auras attached to permanents you control (i.e. that you don't own) filter5.add(new AttachedToControlledPermanentPredicate()); filter5.add(SubType.AURA.getPredicate()); - filter5.add(new OwnerPredicate(TargetController.NOT_YOU)); + filter5.add(TargetController.NOT_YOU.getOwnerPredicate()); // all other Auras attached to attacking creatures your opponents control (i.e. that you don't own) filter6.add(new AttachedToOpponentControlledAttackingCreaturePredicate()); filter6.add(SubType.AURA.getPredicate()); - filter6.add(new OwnerPredicate(TargetController.NOT_YOU)); + filter6.add(TargetController.NOT_YOU.getOwnerPredicate()); } public RemoveEnchantments(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RiftElemental.java b/Mage.Sets/src/mage/cards/r/RiftElemental.java index eb2a1462c91..1118c209f98 100644 --- a/Mage.Sets/src/mage/cards/r/RiftElemental.java +++ b/Mage.Sets/src/mage/cards/r/RiftElemental.java @@ -20,7 +20,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterPermanentOrSuspendedCard; -import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; import mage.game.Game; @@ -64,7 +63,7 @@ class RiftElementalCost extends CostImpl { static { filter.getPermanentFilter().add(new ControllerPredicate(TargetController.YOU)); filter.getPermanentFilter().add(new CounterPredicate(CounterType.TIME)); - filter.getCardFilter().add(new OwnerPredicate(TargetController.YOU)); + filter.getCardFilter().add(TargetController.YOU.getOwnerPredicate()); } RiftElementalCost() { diff --git a/Mage.Sets/src/mage/cards/r/RunicRepetition.java b/Mage.Sets/src/mage/cards/r/RunicRepetition.java index ce65261460b..3db7ed87531 100644 --- a/Mage.Sets/src/mage/cards/r/RunicRepetition.java +++ b/Mage.Sets/src/mage/cards/r/RunicRepetition.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.other.OwnerPredicate; import mage.target.common.TargetCardInExile; /** @@ -22,7 +21,7 @@ public final class RunicRepetition extends CardImpl { private static final FilterCard filter = new FilterCard("exiled card with flashback you own"); static { - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); filter.add(new AbilityPredicate(FlashbackAbility.class)); } diff --git a/Mage.Sets/src/mage/cards/s/SanctumOfEternity.java b/Mage.Sets/src/mage/cards/s/SanctumOfEternity.java index 67e61eaccb2..88ecf105470 100644 --- a/Mage.Sets/src/mage/cards/s/SanctumOfEternity.java +++ b/Mage.Sets/src/mage/cards/s/SanctumOfEternity.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.CommanderPredicate; import mage.target.TargetPermanent; @@ -28,7 +27,7 @@ public final class SanctumOfEternity extends CardImpl { static { filter.add(CommanderPredicate.instance); - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); } public SanctumOfEternity(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SavingGrasp.java b/Mage.Sets/src/mage/cards/s/SavingGrasp.java index 2f4bf78b629..30d835c8d0b 100644 --- a/Mage.Sets/src/mage/cards/s/SavingGrasp.java +++ b/Mage.Sets/src/mage/cards/s/SavingGrasp.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.TimingRule; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.OwnerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -23,7 +22,7 @@ public final class SavingGrasp extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you own"); static { - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); } public SavingGrasp(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ScarabOfTheUnseen.java b/Mage.Sets/src/mage/cards/s/ScarabOfTheUnseen.java index 091cc09f079..7493348f67c 100644 --- a/Mage.Sets/src/mage/cards/s/ScarabOfTheUnseen.java +++ b/Mage.Sets/src/mage/cards/s/ScarabOfTheUnseen.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.other.OwnerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -30,7 +29,7 @@ public final class ScarabOfTheUnseen extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("permanent you own"); static { - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); } public ScarabOfTheUnseen(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SilentSentinel.java b/Mage.Sets/src/mage/cards/s/SilentSentinel.java index 220169da944..c5f8b075a71 100644 --- a/Mage.Sets/src/mage/cards/s/SilentSentinel.java +++ b/Mage.Sets/src/mage/cards/s/SilentSentinel.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterCard; -import mage.filter.predicate.other.OwnerPredicate; import mage.target.common.TargetCardInGraveyard; /** @@ -25,7 +24,7 @@ public final class SilentSentinel extends CardImpl { private static final FilterCard filter = new FilterCard("enchantment card from your graveyard"); static { filter.add(CardType.ENCHANTMENT.getPredicate()); - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); } public SilentSentinel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpurnmageAdvocate.java b/Mage.Sets/src/mage/cards/s/SpurnmageAdvocate.java index f14b00a519a..902ae1e81e0 100644 --- a/Mage.Sets/src/mage/cards/s/SpurnmageAdvocate.java +++ b/Mage.Sets/src/mage/cards/s/SpurnmageAdvocate.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.other.OwnerPredicate; import mage.target.common.TargetAttackingCreature; import mage.target.common.TargetCardInASingleGraveyard; import mage.target.targetpointer.SecondTargetPointer; @@ -30,7 +29,7 @@ public final class SpurnmageAdvocate extends CardImpl { private static final FilterCard filter = new FilterCard("two target cards from an opponent's graveyard"); static { - filter.add(new OwnerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getOwnerPredicate()); } public SpurnmageAdvocate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java b/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java index 04272ab048b..713c2cf2a3a 100644 --- a/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java +++ b/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java @@ -19,7 +19,6 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; @@ -46,7 +45,7 @@ public final class StarfieldOfNyx extends CardImpl { static { filterGraveyardEnchantment.add(CardType.ENCHANTMENT.getPredicate()); - filterGraveyardEnchantment.add(new OwnerPredicate(TargetController.YOU)); + filterGraveyardEnchantment.add(TargetController.YOU.getOwnerPredicate()); } public StarfieldOfNyx(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/StormfrontRiders.java b/Mage.Sets/src/mage/cards/s/StormfrontRiders.java index 4aaf9f2ac59..30d6dde3e99 100644 --- a/Mage.Sets/src/mage/cards/s/StormfrontRiders.java +++ b/Mage.Sets/src/mage/cards/s/StormfrontRiders.java @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.OwnerPredicate; import mage.game.permanent.token.SoldierToken; /** @@ -28,7 +27,7 @@ public final class StormfrontRiders extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); } public StormfrontRiders(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TelJiladStylus.java b/Mage.Sets/src/mage/cards/t/TelJiladStylus.java index 5b252c5b960..892aa141447 100644 --- a/Mage.Sets/src/mage/cards/t/TelJiladStylus.java +++ b/Mage.Sets/src/mage/cards/t/TelJiladStylus.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.other.OwnerPredicate; import mage.target.TargetPermanent; /** @@ -25,7 +24,7 @@ public final class TelJiladStylus extends CardImpl { private static final FilterPermanent filter = new FilterPermanent(); static { - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); } public TelJiladStylus(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/ThievingAmalgam.java b/Mage.Sets/src/mage/cards/t/ThievingAmalgam.java index 161e8a6dfd6..d28aed647ed 100644 --- a/Mage.Sets/src/mage/cards/t/ThievingAmalgam.java +++ b/Mage.Sets/src/mage/cards/t/ThievingAmalgam.java @@ -17,7 +17,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.other.OwnerPredicate; import mage.game.Game; import mage.players.Player; @@ -33,7 +32,7 @@ public final class ThievingAmalgam extends CardImpl { = new FilterControlledCreaturePermanent("a creature you control but don't own"); static { - filter.add(new OwnerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getOwnerPredicate()); } public ThievingAmalgam(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TomeOfLegends.java b/Mage.Sets/src/mage/cards/t/TomeOfLegends.java index a1cd9cba250..a3f2e15a96f 100644 --- a/Mage.Sets/src/mage/cards/t/TomeOfLegends.java +++ b/Mage.Sets/src/mage/cards/t/TomeOfLegends.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.FilterPermanent; -import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.CommanderPredicate; import java.util.UUID; @@ -29,7 +28,7 @@ public final class TomeOfLegends extends CardImpl { static { filter.add(CommanderPredicate.instance); - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); } public TomeOfLegends(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UlamogsDespoiler.java b/Mage.Sets/src/mage/cards/u/UlamogsDespoiler.java index 8db6e24f69c..813ac67f62e 100644 --- a/Mage.Sets/src/mage/cards/u/UlamogsDespoiler.java +++ b/Mage.Sets/src/mage/cards/u/UlamogsDespoiler.java @@ -18,7 +18,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterCard; -import mage.filter.predicate.other.OwnerPredicate; import mage.game.Game; import mage.players.Player; import mage.target.Target; @@ -57,7 +56,7 @@ class UlamogsDespoilerEffect extends OneShotEffect { private static final FilterCard filter = new FilterCard("cards your opponents own from exile"); static { - filter.add(new OwnerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getOwnerPredicate()); } public UlamogsDespoilerEffect() { diff --git a/Mage.Sets/src/mage/cards/u/UlamogsNullifier.java b/Mage.Sets/src/mage/cards/u/UlamogsNullifier.java index 3490922e624..4647d7c207a 100644 --- a/Mage.Sets/src/mage/cards/u/UlamogsNullifier.java +++ b/Mage.Sets/src/mage/cards/u/UlamogsNullifier.java @@ -19,7 +19,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.other.OwnerPredicate; import mage.game.Game; import mage.game.stack.Spell; import mage.players.Player; @@ -71,7 +70,7 @@ class UlamogsNullifierEffect extends OneShotEffect { private static final FilterCard filter = new FilterCard("cards your opponents own from exile"); static { - filter.add(new OwnerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getOwnerPredicate()); } public UlamogsNullifierEffect() { diff --git a/Mage.Sets/src/mage/cards/v/VenserTheSojourner.java b/Mage.Sets/src/mage/cards/v/VenserTheSojourner.java index 87b3754f20e..73781237d07 100644 --- a/Mage.Sets/src/mage/cards/v/VenserTheSojourner.java +++ b/Mage.Sets/src/mage/cards/v/VenserTheSojourner.java @@ -17,7 +17,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; -import mage.filter.predicate.other.OwnerPredicate; import mage.game.Game; import mage.game.command.emblems.VenserTheSojournerEmblem; import mage.game.permanent.Permanent; @@ -34,7 +33,7 @@ public final class VenserTheSojourner extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("permanent you own"); static { - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); } public VenserTheSojourner(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WardenOfTheEye.java b/Mage.Sets/src/mage/cards/w/WardenOfTheEye.java index e3320ce2a4c..c07810c31d4 100644 --- a/Mage.Sets/src/mage/cards/w/WardenOfTheEye.java +++ b/Mage.Sets/src/mage/cards/w/WardenOfTheEye.java @@ -14,7 +14,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.other.OwnerPredicate; import mage.target.TargetCard; /** @@ -26,7 +25,7 @@ public final class WardenOfTheEye extends CardImpl { private static final FilterCard filter = new FilterCard("noncreature, nonland card from your graveyard"); static { - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); filter.add(Predicates.not(CardType.CREATURE.getPredicate())); filter.add(Predicates.not(CardType.LAND.getPredicate())); } diff --git a/Mage.Sets/src/mage/cards/w/WildPair.java b/Mage.Sets/src/mage/cards/w/WildPair.java index 6349ee4aede..ad3dab657c7 100644 --- a/Mage.Sets/src/mage/cards/w/WildPair.java +++ b/Mage.Sets/src/mage/cards/w/WildPair.java @@ -15,7 +15,6 @@ import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.IntComparePredicate; -import mage.filter.predicate.other.OwnerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.stack.Spell; @@ -32,7 +31,7 @@ public final class WildPair extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature"); static { - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); } public WildPair(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WrennAndSix.java b/Mage.Sets/src/mage/cards/w/WrennAndSix.java index d92bd437361..8288e659d40 100644 --- a/Mage.Sets/src/mage/cards/w/WrennAndSix.java +++ b/Mage.Sets/src/mage/cards/w/WrennAndSix.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterLandCard; -import mage.filter.predicate.other.OwnerPredicate; import mage.game.command.emblems.WrennAndSixEmblem; import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCardInYourGraveyard; @@ -28,7 +27,7 @@ public final class WrennAndSix extends CardImpl { private static final FilterLandCard filter = new FilterLandCard("land card from your graveyard"); static { - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); } public WrennAndSix(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/y/YodaJediMaster.java b/Mage.Sets/src/mage/cards/y/YodaJediMaster.java index 24b4f8132a0..63f1a3768db 100644 --- a/Mage.Sets/src/mage/cards/y/YodaJediMaster.java +++ b/Mage.Sets/src/mage/cards/y/YodaJediMaster.java @@ -22,7 +22,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.FilterPermanent; -import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; import mage.game.command.emblems.YodaEmblem; @@ -40,7 +39,7 @@ public final class YodaJediMaster extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new OwnerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getOwnerPredicate()); } public YodaJediMaster(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage/src/main/java/mage/abilities/common/PutCardIntoGraveFromAnywhereAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/PutCardIntoGraveFromAnywhereAllTriggeredAbility.java index 22f7be80d86..aaf1597ab7f 100644 --- a/Mage/src/main/java/mage/abilities/common/PutCardIntoGraveFromAnywhereAllTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/PutCardIntoGraveFromAnywhereAllTriggeredAbility.java @@ -8,7 +8,6 @@ import mage.constants.SetTargetPointer; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.other.OwnerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -40,7 +39,7 @@ public class PutCardIntoGraveFromAnywhereAllTriggeredAbility extends TriggeredAb super(zone, effect, optional); this.filter = filter.copy(); this.setTargetPointer = setTargetPointer; - this.filter.add(new OwnerPredicate(targetController)); + this.filter.add(targetController.getOwnerPredicate()); StringBuilder sb = new StringBuilder("Whenever "); sb.append(filter.getMessage()); sb.append(" is put into "); diff --git a/Mage/src/main/java/mage/abilities/costs/common/ExileOpponentsCardFromExileToGraveyardCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileOpponentsCardFromExileToGraveyardCost.java index d26ffb11e91..38045a9cf8d 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileOpponentsCardFromExileToGraveyardCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileOpponentsCardFromExileToGraveyardCost.java @@ -14,7 +14,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.other.OwnerPredicate; import mage.game.Game; import mage.players.Player; import mage.target.Target; @@ -43,7 +42,7 @@ public class ExileOpponentsCardFromExileToGraveyardCost extends CostImpl { Player controller = game.getPlayer(controllerId); if (controller != null) { FilterCard filter = new FilterCard(); - filter.add(new OwnerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getOwnerPredicate()); Target target = new TargetCardInExile(filter); if (controller.chooseTarget(Outcome.Damage, target, ability, game)) { Card card = game.getCard(target.getFirstTarget()); diff --git a/Mage/src/main/java/mage/constants/TargetController.java b/Mage/src/main/java/mage/constants/TargetController.java index 1c0220833ae..23797e9125e 100644 --- a/Mage/src/main/java/mage/constants/TargetController.java +++ b/Mage/src/main/java/mage/constants/TargetController.java @@ -34,7 +34,7 @@ public enum TargetController { private final DamagedPlayerThisTurnPredicate damagedPlayerThisTurnPredicate; TargetController() { - this.ownerPredicate = new OwnerPredicate(this); + this.ownerPredicate = this.getOwnerPredicate(); this.playerPredicate = new PlayerPredicate(this); this.controllerPredicate = new ControllerPredicate(this); this.damagedPlayerThisTurnPredicate = new DamagedPlayerThisTurnPredicate(this); diff --git a/Mage/src/main/java/mage/filter/common/FilterOwnedCard.java b/Mage/src/main/java/mage/filter/common/FilterOwnedCard.java index 56727cf2a9a..8267926ab18 100644 --- a/Mage/src/main/java/mage/filter/common/FilterOwnedCard.java +++ b/Mage/src/main/java/mage/filter/common/FilterOwnedCard.java @@ -4,7 +4,6 @@ package mage.filter.common; import mage.constants.TargetController; import mage.filter.FilterCard; -import mage.filter.predicate.other.OwnerPredicate; /** * @@ -18,7 +17,7 @@ public class FilterOwnedCard extends FilterCard { public FilterOwnedCard(String name) { super(name); - this.add(new OwnerPredicate(TargetController.YOU)); + this.add(TargetController.YOU.getOwnerPredicate()); } public FilterOwnedCard(final FilterOwnedCard filter) { diff --git a/Mage/src/main/java/mage/filter/predicate/other/OwnerPredicate.java b/Mage/src/main/java/mage/filter/predicate/other/OwnerPredicate.java deleted file mode 100644 index 1050e0d04a1..00000000000 --- a/Mage/src/main/java/mage/filter/predicate/other/OwnerPredicate.java +++ /dev/null @@ -1,59 +0,0 @@ - -package mage.filter.predicate.other; - -import java.util.UUID; -import mage.cards.Card; -import mage.constants.TargetController; -import mage.filter.predicate.ObjectPlayer; -import mage.filter.predicate.ObjectPlayerPredicate; -import mage.game.Game; - -/** - * - * @author North - */ -public class OwnerPredicate implements ObjectPlayerPredicate> { - - private final TargetController targetOwner; - - public OwnerPredicate(TargetController targetOwner) { - this.targetOwner = targetOwner; - } - - @Override - public boolean apply(ObjectPlayer input, Game game) { - Card card = input.getObject(); - UUID playerId = input.getPlayerId(); - if (card == null || playerId == null) { - return false; - } - - switch (targetOwner) { - case YOU: - if (card.isOwnedBy(playerId)) { - return true; - } - break; - case OPPONENT: - if (!card.isOwnedBy(playerId) - && game.getPlayer(playerId).hasOpponent(card.getOwnerId(), game)) { - return true; - } - break; - case NOT_YOU: - if (!card.isOwnedBy(playerId)) { - return true; - } - break; - case ANY: - return true; - } - - return false; - } - - @Override - public String toString() { - return "Owner(" + targetOwner + ')'; - } -}