From 8e294549163601c0eeb45c50f99bec7938b72036 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Mon, 6 Jan 2020 19:47:34 -0500 Subject: [PATCH 1/9] add predicates to TargetController --- .../java/mage/constants/TargetController.java | 252 +++++++++++++++++- 1 file changed, 250 insertions(+), 2 deletions(-) diff --git a/Mage/src/main/java/mage/constants/TargetController.java b/Mage/src/main/java/mage/constants/TargetController.java index f1dd2e1b607..1c0220833ae 100644 --- a/Mage/src/main/java/mage/constants/TargetController.java +++ b/Mage/src/main/java/mage/constants/TargetController.java @@ -1,10 +1,258 @@ package mage.constants; +import mage.cards.Card; +import mage.filter.predicate.ObjectPlayer; +import mage.filter.predicate.ObjectPlayerPredicate; +import mage.filter.predicate.ObjectSourcePlayer; +import mage.filter.predicate.ObjectSourcePlayerPredicate; +import mage.game.Controllable; +import mage.game.Game; +import mage.players.Player; +import mage.watchers.common.PlayerDamagedBySourceWatcher; + +import java.util.UUID; + /** - * * @author North */ public enum TargetController { - ACTIVE, ANY, YOU, NOT_YOU, OPPONENT, TEAM, OWNER, CONTROLLER_ATTACHED_TO, NEXT, EACH_PLAYER + ACTIVE, + ANY, + YOU, + NOT_YOU, + OPPONENT, + TEAM, + OWNER, + CONTROLLER_ATTACHED_TO, + NEXT, + EACH_PLAYER; + + private final OwnerPredicate ownerPredicate; + private final PlayerPredicate playerPredicate; + private final ControllerPredicate controllerPredicate; + private final DamagedPlayerThisTurnPredicate damagedPlayerThisTurnPredicate; + + TargetController() { + this.ownerPredicate = new OwnerPredicate(this); + this.playerPredicate = new PlayerPredicate(this); + this.controllerPredicate = new ControllerPredicate(this); + this.damagedPlayerThisTurnPredicate = new DamagedPlayerThisTurnPredicate(this); + } + + public OwnerPredicate getOwnerPredicate() { + return ownerPredicate; + } + + public PlayerPredicate getPlayerPredicate() { + return playerPredicate; + } + + public ControllerPredicate getControllerPredicate() { + return controllerPredicate; + } + + public DamagedPlayerThisTurnPredicate getDamagedPlayerThisTurnPredicate() { + return damagedPlayerThisTurnPredicate; + } + + public static 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 + ')'; + } + } + + public static class PlayerPredicate implements ObjectSourcePlayerPredicate> { + + private final TargetController targetPlayer; + + public PlayerPredicate(TargetController player) { + this.targetPlayer = player; + } + + @Override + public boolean apply(ObjectSourcePlayer input, Game game) { + Player player = input.getObject(); + UUID playerId = input.getPlayerId(); + if (player == null || playerId == null) { + return false; + } + + switch (targetPlayer) { + case YOU: + if (player.getId().equals(playerId)) { + return true; + } + break; + case OPPONENT: + if (!player.getId().equals(playerId) && + game.getPlayer(playerId).hasOpponent(player.getId(), game)) { + return true; + } + break; + case NOT_YOU: + if (!player.getId().equals(playerId)) { + return true; + } + break; + } + + return false; + } + + @Override + public String toString() { + return "Player(" + targetPlayer + ')'; + } + } + + public static class ControllerPredicate implements ObjectPlayerPredicate> { + + private final TargetController controller; + + public ControllerPredicate(TargetController controller) { + this.controller = controller; + } + + @Override + public boolean apply(ObjectPlayer input, Game game) { + Controllable object = input.getObject(); + UUID playerId = input.getPlayerId(); + + switch (controller) { + case YOU: + if (object.isControlledBy(playerId)) { + return true; + } + break; + case TEAM: + if (!game.getPlayer(playerId).hasOpponent(object.getControllerId(), game)) { + return true; + } + break; + case OPPONENT: + if (!object.isControlledBy(playerId) + && game.getPlayer(playerId).hasOpponent(object.getControllerId(), game)) { + return true; + } + break; + case NOT_YOU: + if (!object.isControlledBy(playerId)) { + return true; + } + break; + case ACTIVE: + if (object.isControlledBy(game.getActivePlayerId())) { + return true; + } + break; + case ANY: + return true; + } + + return false; + } + + @Override + public String toString() { + return "TargetController(" + controller.toString() + ')'; + } + } + + public static class DamagedPlayerThisTurnPredicate implements ObjectPlayerPredicate> { + + private final TargetController controller; + + public DamagedPlayerThisTurnPredicate(TargetController controller) { + this.controller = controller; + } + + @Override + public boolean apply(ObjectPlayer input, Game game) { + Controllable object = input.getObject(); + UUID playerId = input.getPlayerId(); + + switch (controller) { + case YOU: + PlayerDamagedBySourceWatcher watcher = game.getState().getWatcher(PlayerDamagedBySourceWatcher.class, playerId); + if (watcher != null) { + return watcher.hasSourceDoneDamage(object.getId(), game); + } + break; + case OPPONENT: + for (UUID opponentId : game.getOpponents(playerId)) { + watcher = game.getState().getWatcher(PlayerDamagedBySourceWatcher.class, opponentId); + if (watcher != null) { + return watcher.hasSourceDoneDamage(object.getId(), game); + } + } + break; + case NOT_YOU: + for (UUID notYouId : game.getState().getPlayersInRange(playerId, game)) { + if (!notYouId.equals(playerId)) { + watcher = game.getState().getWatcher(PlayerDamagedBySourceWatcher.class, notYouId); + if (watcher != null) { + return watcher.hasSourceDoneDamage(object.getId(), game); + } + } + } + break; + case ANY: + for (UUID anyId : game.getState().getPlayersInRange(playerId, game)) { + watcher = game.getState().getWatcher(PlayerDamagedBySourceWatcher.class, anyId); + if (watcher != null) { + return watcher.hasSourceDoneDamage(object.getId(), game); + } + } + return true; + } + + return false; + } + + @Override + public String toString() { + return "Damaged player (" + controller.toString() + ')'; + } + } } From 13d76bfc067a02c08727fc8d5e1075bc72cc6b73 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Mon, 6 Jan 2020 19:53:29 -0500 Subject: [PATCH 2/9] refactored PlayerPredicate --- .../src/mage/cards/b/BlessedAlliance.java | 3 +- .../src/mage/cards/c/CollectiveBrutality.java | 5 +- Mage.Sets/src/mage/cards/e/Endure.java | 3 +- .../src/mage/cards/f/FireAndBrimstone.java | 33 +++++------ .../src/mage/cards/s/SavageAlliance.java | 3 +- Mage.Sets/src/mage/cards/w/WheelAndDeal.java | 3 +- .../costs/common/GainLifeOpponentCost.java | 3 +- .../mage/abilities/keyword/AssistAbility.java | 3 +- .../main/java/mage/filter/FilterOpponent.java | 3 +- .../main/java/mage/filter/StaticFilters.java | 3 +- .../predicate/other/PlayerPredicate.java | 57 ------------------- 11 files changed, 23 insertions(+), 96 deletions(-) delete mode 100644 Mage/src/main/java/mage/filter/predicate/other/PlayerPredicate.java diff --git a/Mage.Sets/src/mage/cards/b/BlessedAlliance.java b/Mage.Sets/src/mage/cards/b/BlessedAlliance.java index e2db331f7e5..7c7296dc8e8 100644 --- a/Mage.Sets/src/mage/cards/b/BlessedAlliance.java +++ b/Mage.Sets/src/mage/cards/b/BlessedAlliance.java @@ -14,7 +14,6 @@ import mage.constants.TargetController; import mage.filter.FilterPlayer; import mage.filter.common.FilterAttackingCreature; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.PlayerPredicate; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; @@ -30,7 +29,7 @@ public final class BlessedAlliance extends CardImpl { private static final FilterPlayer filterGainLife = new FilterPlayer("player to gain life"); static { - filterSacrifice.add(new PlayerPredicate(TargetController.OPPONENT)); + filterSacrifice.add(TargetController.OPPONENT.getPlayerPredicate()); } public BlessedAlliance(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CollectiveBrutality.java b/Mage.Sets/src/mage/cards/c/CollectiveBrutality.java index a89585c75c3..9d60e693abc 100644 --- a/Mage.Sets/src/mage/cards/c/CollectiveBrutality.java +++ b/Mage.Sets/src/mage/cards/c/CollectiveBrutality.java @@ -18,7 +18,6 @@ import mage.filter.FilterCard; import mage.filter.FilterPlayer; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.other.PlayerPredicate; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; @@ -37,8 +36,8 @@ public final class CollectiveBrutality extends CardImpl { static { filter.add(Predicates.or(CardType.INSTANT.getPredicate(), CardType.SORCERY.getPredicate())); - filterDiscard.add(new PlayerPredicate(TargetController.OPPONENT)); - filterLoseLife.add(new PlayerPredicate(TargetController.OPPONENT)); + filterDiscard.add(TargetController.OPPONENT.getPlayerPredicate()); + filterLoseLife.add(TargetController.OPPONENT.getPlayerPredicate()); } public CollectiveBrutality(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/Endure.java b/Mage.Sets/src/mage/cards/e/Endure.java index 80c3866cb41..2ef0a87d1fa 100644 --- a/Mage.Sets/src/mage/cards/e/Endure.java +++ b/Mage.Sets/src/mage/cards/e/Endure.java @@ -9,7 +9,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePlayerOrPlaneswalker; -import mage.filter.predicate.other.PlayerPredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -22,7 +21,7 @@ public final class Endure extends CardImpl { static { filter.getCreatureFilter().add(new ControllerPredicate(TargetController.YOU)); - filter.getPlayerFilter().add(new PlayerPredicate(TargetController.YOU)); + filter.getPlayerFilter().add(TargetController.YOU.getPlayerPredicate()); } public Endure(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FireAndBrimstone.java b/Mage.Sets/src/mage/cards/f/FireAndBrimstone.java index 92e9f2cf2a1..6dc7fe7f3d7 100644 --- a/Mage.Sets/src/mage/cards/f/FireAndBrimstone.java +++ b/Mage.Sets/src/mage/cards/f/FireAndBrimstone.java @@ -1,7 +1,5 @@ - package mage.cards.f; -import java.util.UUID; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; @@ -9,26 +7,27 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterPlayer; import mage.filter.predicate.ObjectSourcePlayer; -import mage.filter.predicate.other.PlayerPredicate; +import mage.filter.predicate.ObjectSourcePlayerPredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; import mage.watchers.common.AttackedThisTurnWatcher; +import java.util.UUID; + /** - * * @author L_J */ public final class FireAndBrimstone extends CardImpl { - private static final FilterPlayer filter = new FilterPlayer("player who attacked this turn"); + private static final FilterPlayer filter = new FilterPlayer("player who attacked this turn"); - static { - filter.add(new FireAndBrimstonePredicate()); + static { + filter.add(FireAndBrimstonePredicate.instance); } public FireAndBrimstone(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{W}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{W}{W}"); // Fire and Brimstone deals 4 damage to target player who attacked this turn and 4 damage to you. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); @@ -36,7 +35,7 @@ public final class FireAndBrimstone extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer(1, 1, false, filter)); } - public FireAndBrimstone(final FireAndBrimstone card) { + private FireAndBrimstone(final FireAndBrimstone card) { super(card); } @@ -46,11 +45,8 @@ public final class FireAndBrimstone extends CardImpl { } } -class FireAndBrimstonePredicate extends PlayerPredicate { - - public FireAndBrimstonePredicate() { - super(null); - } +enum FireAndBrimstonePredicate implements ObjectSourcePlayerPredicate> { + instance; @Override public boolean apply(ObjectSourcePlayer input, Game game) { @@ -60,11 +56,8 @@ class FireAndBrimstonePredicate extends PlayerPredicate { return false; } AttackedThisTurnWatcher watcher = game.getState().getWatcher(AttackedThisTurnWatcher.class); - if (watcher != null) { - if (!watcher.getAttackedThisTurnCreatures().isEmpty()) { - return player.getId().equals(game.getActivePlayerId()); - } - } - return false; + return watcher != null + && !watcher.getAttackedThisTurnCreatures().isEmpty() + && player.getId().equals(game.getActivePlayerId()); } } diff --git a/Mage.Sets/src/mage/cards/s/SavageAlliance.java b/Mage.Sets/src/mage/cards/s/SavageAlliance.java index 3566b203624..74215c38f72 100644 --- a/Mage.Sets/src/mage/cards/s/SavageAlliance.java +++ b/Mage.Sets/src/mage/cards/s/SavageAlliance.java @@ -18,7 +18,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.FilterPlayer; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.PlayerPredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -39,7 +38,7 @@ public final class SavageAlliance extends CardImpl { private static final FilterPlayer filterOpponent = new FilterPlayer(); static { - filterOpponent.add(new PlayerPredicate(TargetController.OPPONENT)); + filterOpponent.add(TargetController.OPPONENT.getPlayerPredicate()); } public SavageAlliance(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WheelAndDeal.java b/Mage.Sets/src/mage/cards/w/WheelAndDeal.java index e57573e4be3..7b944d568d9 100644 --- a/Mage.Sets/src/mage/cards/w/WheelAndDeal.java +++ b/Mage.Sets/src/mage/cards/w/WheelAndDeal.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.FilterPlayer; -import mage.filter.predicate.other.PlayerPredicate; import mage.target.TargetPlayer; /** @@ -23,7 +22,7 @@ public final class WheelAndDeal extends CardImpl { private static final FilterPlayer filter = new FilterPlayer("opponent"); static { - filter.add(new PlayerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getPlayerPredicate()); } public WheelAndDeal(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage/src/main/java/mage/abilities/costs/common/GainLifeOpponentCost.java b/Mage/src/main/java/mage/abilities/costs/common/GainLifeOpponentCost.java index 2ff1e0a962f..b91407c6463 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/GainLifeOpponentCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/GainLifeOpponentCost.java @@ -14,7 +14,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.FilterPlayer; import mage.filter.predicate.other.PlayerCanGainLifePredicate; -import mage.filter.predicate.other.PlayerPredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; @@ -28,7 +27,7 @@ public class GainLifeOpponentCost extends CostImpl { private static final FilterPlayer filter = new FilterPlayer("opponent that can gain life"); static { - filter.add(new PlayerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getPlayerPredicate()); filter.add(new PlayerCanGainLifePredicate()); // you can't pay the costs by letting a player gain life that can't get life by rule changing effect } diff --git a/Mage/src/main/java/mage/abilities/keyword/AssistAbility.java b/Mage/src/main/java/mage/abilities/keyword/AssistAbility.java index af1a6b7af1e..7da5d3a4476 100644 --- a/Mage/src/main/java/mage/abilities/keyword/AssistAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/AssistAbility.java @@ -10,7 +10,6 @@ import mage.abilities.costs.mana.ManaCost; import mage.abilities.effects.OneShotEffect; import mage.constants.*; import mage.filter.FilterPlayer; -import mage.filter.predicate.other.PlayerPredicate; import mage.game.Game; import mage.players.ManaPool; import mage.players.Player; @@ -26,7 +25,7 @@ public class AssistAbility extends SimpleStaticAbility implements AlternateManaP private static final FilterPlayer filter = new FilterPlayer("another player"); static { - filter.add(new PlayerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getPlayerPredicate()); } public AssistAbility() { diff --git a/Mage/src/main/java/mage/filter/FilterOpponent.java b/Mage/src/main/java/mage/filter/FilterOpponent.java index 92199ffc54d..5bce6d08d01 100644 --- a/Mage/src/main/java/mage/filter/FilterOpponent.java +++ b/Mage/src/main/java/mage/filter/FilterOpponent.java @@ -2,7 +2,6 @@ package mage.filter; import mage.constants.TargetController; -import mage.filter.predicate.other.PlayerPredicate; /** * @@ -16,7 +15,7 @@ public class FilterOpponent extends FilterPlayer { public FilterOpponent(String text) { super(text); - add(new PlayerPredicate(TargetController.OPPONENT)); + add(TargetController.OPPONENT.getPlayerPredicate()); } public FilterOpponent(final FilterOpponent filter) { diff --git a/Mage/src/main/java/mage/filter/StaticFilters.java b/Mage/src/main/java/mage/filter/StaticFilters.java index b34a1a9f6c9..870bc0f6c36 100644 --- a/Mage/src/main/java/mage/filter/StaticFilters.java +++ b/Mage/src/main/java/mage/filter/StaticFilters.java @@ -12,7 +12,6 @@ import mage.constants.TargetController; import mage.filter.common.*; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.MulticoloredPredicate; -import mage.filter.predicate.other.PlayerPredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.AttackingPredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -633,7 +632,7 @@ public final class StaticFilters { public static final FilterPlayer FILTER_PLAYER_CONTROLLER = new FilterPlayer("you"); static { - FILTER_PLAYER_CONTROLLER.add(new PlayerPredicate(TargetController.YOU)); + FILTER_PLAYER_CONTROLLER.add(TargetController.YOU.getPlayerPredicate()); FILTER_PLAYER_CONTROLLER.setLockedFilter(true); } } diff --git a/Mage/src/main/java/mage/filter/predicate/other/PlayerPredicate.java b/Mage/src/main/java/mage/filter/predicate/other/PlayerPredicate.java deleted file mode 100644 index 5a365687e76..00000000000 --- a/Mage/src/main/java/mage/filter/predicate/other/PlayerPredicate.java +++ /dev/null @@ -1,57 +0,0 @@ - -package mage.filter.predicate.other; - -import java.util.UUID; -import mage.constants.TargetController; -import mage.filter.predicate.ObjectSourcePlayer; -import mage.filter.predicate.ObjectSourcePlayerPredicate; -import mage.game.Game; -import mage.players.Player; - -/** - * - * @author North - */ -public class PlayerPredicate implements ObjectSourcePlayerPredicate> { - - private final TargetController targetPlayer; - - public PlayerPredicate(TargetController player) { - this.targetPlayer = player; - } - - @Override - public boolean apply(ObjectSourcePlayer input, Game game) { - Player player = input.getObject(); - UUID playerId = input.getPlayerId(); - if (player == null || playerId == null) { - return false; - } - - switch (targetPlayer) { - case YOU: - if (player.getId().equals(playerId)) { - return true; - } - break; - case OPPONENT: - if (!player.getId().equals(playerId) && - game.getPlayer(playerId).hasOpponent(player.getId(), game)) { - return true; - } - break; - case NOT_YOU: - if (!player.getId().equals(playerId)) { - return true; - } - break; - } - - return false; - } - - @Override - public String toString() { - return "Player(" + targetPlayer + ')'; - } -} From 3f0547a7faa581a3fbec245774511c8cdb3bd4c6 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Mon, 6 Jan 2020 19:56:08 -0500 Subject: [PATCH 3/9] refactored DamagedPlayerThisTurnPredicate --- Mage.Sets/src/mage/cards/r/Retaliate.java | 15 ++-- Mage.Sets/src/mage/cards/s/SpearOfHeliod.java | 24 ++++--- .../DamagedPlayerThisTurnPredicate.java | 71 ------------------- 3 files changed, 23 insertions(+), 87 deletions(-) delete mode 100644 Mage/src/main/java/mage/filter/predicate/permanent/DamagedPlayerThisTurnPredicate.java diff --git a/Mage.Sets/src/mage/cards/r/Retaliate.java b/Mage.Sets/src/mage/cards/r/Retaliate.java index a1fc5d34be2..ac49c605a99 100644 --- a/Mage.Sets/src/mage/cards/r/Retaliate.java +++ b/Mage.Sets/src/mage/cards/r/Retaliate.java @@ -1,26 +1,29 @@ package mage.cards.r; -import java.util.UUID; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.DamagedPlayerThisTurnPredicate; + +import java.util.UUID; /** - * * @author Plopman */ public final class Retaliate extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures that dealt damage to you this turn"); + + private static final FilterCreaturePermanent filter + = new FilterCreaturePermanent("creatures that dealt damage to you this turn"); + static { - filter.add(new DamagedPlayerThisTurnPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getDamagedPlayerThisTurnPredicate()); } + public Retaliate(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{W}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{W}{W}"); // Destroy all creatures that dealt damage to you this turn. this.getSpellAbility().addEffect(new DestroyAllEffect(filter)); diff --git a/Mage.Sets/src/mage/cards/s/SpearOfHeliod.java b/Mage.Sets/src/mage/cards/s/SpearOfHeliod.java index 0d6a3daf7f8..d131443bbf1 100644 --- a/Mage.Sets/src/mage/cards/s/SpearOfHeliod.java +++ b/Mage.Sets/src/mage/cards/s/SpearOfHeliod.java @@ -1,7 +1,6 @@ package mage.cards.s; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -11,37 +10,42 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.SuperType; +import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.DamagedPlayerThisTurnPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class SpearOfHeliod extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature that dealt damage to you this turn"); + private static final FilterCreaturePermanent filter + = new FilterCreaturePermanent("creature that dealt damage to you this turn"); + static { - filter.add(new DamagedPlayerThisTurnPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getDamagedPlayerThisTurnPredicate()); } public SpearOfHeliod(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.ARTIFACT},"{1}{W}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT, CardType.ARTIFACT}, "{1}{W}{W}"); addSuperType(SuperType.LEGENDARY); // Creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1,1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield))); + // {1}{W}{W}, {T}: Destroy target creature that dealt damage to you this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{W}{W}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl("{1}{W}{W}")); ability.addCost(new TapSourceCost()); Target target = new TargetCreaturePermanent(filter); ability.addTarget(target); this.addAbility(ability); - } public SpearOfHeliod(final SpearOfHeliod card) { diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/DamagedPlayerThisTurnPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/DamagedPlayerThisTurnPredicate.java deleted file mode 100644 index 191e58133ac..00000000000 --- a/Mage/src/main/java/mage/filter/predicate/permanent/DamagedPlayerThisTurnPredicate.java +++ /dev/null @@ -1,71 +0,0 @@ - -package mage.filter.predicate.permanent; - -import java.util.UUID; -import mage.constants.TargetController; -import mage.filter.predicate.ObjectPlayer; -import mage.filter.predicate.ObjectPlayerPredicate; -import mage.game.Controllable; -import mage.game.Game; -import mage.watchers.common.PlayerDamagedBySourceWatcher; - -/** - * - * @author LevelX2 - */ -public class DamagedPlayerThisTurnPredicate implements ObjectPlayerPredicate> { - - private final TargetController controller; - - public DamagedPlayerThisTurnPredicate(TargetController controller) { - this.controller = controller; - } - - @Override - public boolean apply(ObjectPlayer input, Game game) { - Controllable object = input.getObject(); - UUID playerId = input.getPlayerId(); - - switch (controller) { - case YOU: - PlayerDamagedBySourceWatcher watcher = game.getState().getWatcher(PlayerDamagedBySourceWatcher.class, playerId); - if (watcher != null) { - return watcher.hasSourceDoneDamage(object.getId(), game); - } - break; - case OPPONENT: - for (UUID opponentId : game.getOpponents(playerId)) { - watcher = game.getState().getWatcher(PlayerDamagedBySourceWatcher.class, opponentId); - if (watcher != null) { - return watcher.hasSourceDoneDamage(object.getId(), game); - } - } - break; - case NOT_YOU: - for (UUID notYouId : game.getState().getPlayersInRange(playerId, game)) { - if (!notYouId.equals(playerId)) { - watcher = game.getState().getWatcher(PlayerDamagedBySourceWatcher.class, notYouId); - if (watcher != null) { - return watcher.hasSourceDoneDamage(object.getId(), game); - } - } - } - break; - case ANY: - for (UUID anyId : game.getState().getPlayersInRange(playerId, game)) { - watcher = game.getState().getWatcher(PlayerDamagedBySourceWatcher.class, anyId); - if (watcher != null) { - return watcher.hasSourceDoneDamage(object.getId(), game); - } - } - return true; - } - - return false; - } - - @Override - public String toString() { - return "Damaged player (" + controller.toString() + ')'; - } -} From c14a079cc5e9d92d2753d140b286667671e61448 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Mon, 6 Jan 2020 19:59:56 -0500 Subject: [PATCH 4/9] refactored OwnerPredicate --- .../mage/cards/a/AminatouTheFateshifter.java | 3 +- .../src/mage/cards/a/AshiokNightmareMuse.java | 5 +- .../src/mage/cards/a/AthreosGodOfPassage.java | 3 +- Mage.Sets/src/mage/cards/b/BlightHerder.java | 3 +- Mage.Sets/src/mage/cards/b/Brand.java | 3 +- .../src/mage/cards/b/BridgeFromBelow.java | 5 +- .../src/mage/cards/c/CelestialGatekeeper.java | 3 +- .../src/mage/cards/c/CharmingPrince.java | 3 +- .../src/mage/cards/c/ConjuredCurrency.java | 3 +- .../src/mage/cards/d/DawnbreakReclaimer.java | 3 +- Mage.Sets/src/mage/cards/d/DecayingSoil.java | 3 +- .../src/mage/cards/d/DespoticScepter.java | 3 +- .../src/mage/cards/e/EmbalmersTools.java | 3 +- .../src/mage/cards/g/GethLordOfTheVault.java | 3 +- Mage.Sets/src/mage/cards/g/GrimFeast.java | 3 +- Mage.Sets/src/mage/cards/g/GruulCharm.java | 3 +- .../src/mage/cards/h/HakimLoreweaver.java | 3 +- .../src/mage/cards/h/HannaShipsNavigator.java | 3 +- .../src/mage/cards/h/HedronAlignment.java | 5 +- .../src/mage/cards/h/HeraldOfLeshrac.java | 3 +- .../src/mage/cards/j/JhoirasTimebug.java | 3 +- .../mage/cards/k/KothophedSoulHoarder.java | 3 +- Mage.Sets/src/mage/cards/l/LeaveChance.java | 4 +- .../src/mage/cards/l/LinSivviDefiantHero.java | 3 +- Mage.Sets/src/mage/cards/l/LordWindgrace.java | 3 +- Mage.Sets/src/mage/cards/l/LurkingSkirge.java | 3 +- Mage.Sets/src/mage/cards/m/MythUnbound.java | 3 +- Mage.Sets/src/mage/cards/n/NamelessRace.java | 3 +- .../src/mage/cards/o/ObeliskOfUndoing.java | 3 +- .../src/mage/cards/p/PhyrexianScriptures.java | 3 +- .../src/mage/cards/p/PiasRevolution.java | 3 +- Mage.Sets/src/mage/cards/p/PrizedAmalgam.java | 3 +- .../src/mage/cards/p/PulsemageAdvocate.java | 3 +- .../src/mage/cards/r/RealityScramble.java | 3 +- .../src/mage/cards/r/RemoveEnchantments.java | 13 ++-- Mage.Sets/src/mage/cards/r/RiftElemental.java | 3 +- .../src/mage/cards/r/RunicRepetition.java | 3 +- .../src/mage/cards/s/SanctumOfEternity.java | 3 +- Mage.Sets/src/mage/cards/s/SavingGrasp.java | 3 +- .../src/mage/cards/s/ScarabOfTheUnseen.java | 3 +- .../src/mage/cards/s/SilentSentinel.java | 3 +- .../src/mage/cards/s/SpurnmageAdvocate.java | 3 +- .../src/mage/cards/s/StarfieldOfNyx.java | 3 +- .../src/mage/cards/s/StormfrontRiders.java | 3 +- .../src/mage/cards/t/TelJiladStylus.java | 3 +- .../src/mage/cards/t/ThievingAmalgam.java | 3 +- Mage.Sets/src/mage/cards/t/TomeOfLegends.java | 3 +- .../src/mage/cards/u/UlamogsDespoiler.java | 3 +- .../src/mage/cards/u/UlamogsNullifier.java | 3 +- .../src/mage/cards/v/VenserTheSojourner.java | 3 +- .../src/mage/cards/w/WardenOfTheEye.java | 3 +- Mage.Sets/src/mage/cards/w/WildPair.java | 3 +- Mage.Sets/src/mage/cards/w/WrennAndSix.java | 3 +- .../src/mage/cards/y/YodaJediMaster.java | 3 +- ...oGraveFromAnywhereAllTriggeredAbility.java | 3 +- ...OpponentsCardFromExileToGraveyardCost.java | 3 +- .../java/mage/constants/TargetController.java | 2 +- .../mage/filter/common/FilterOwnedCard.java | 3 +- .../predicate/other/OwnerPredicate.java | 59 ------------------- 59 files changed, 66 insertions(+), 183 deletions(-) delete mode 100644 Mage/src/main/java/mage/filter/predicate/other/OwnerPredicate.java 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 + ')'; - } -} From 9c3b923b3f7f2277049b2c800170858a50f6076c Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Mon, 6 Jan 2020 20:04:56 -0500 Subject: [PATCH 5/9] refactored ControllerPredicate --- .../src/mage/cards/a/AbzanAscendancy.java | 3 +- .../src/mage/cards/a/AbzanBattlePriest.java | 3 +- Mage.Sets/src/mage/cards/a/AbzanFalconer.java | 3 +- .../src/mage/cards/a/ActOfAggression.java | 3 +- .../src/mage/cards/a/AdaptiveAutomaton.java | 3 +- .../src/mage/cards/a/AdelizTheCinderWind.java | 3 +- .../src/mage/cards/a/AdmiralBeckettBrass.java | 3 +- .../src/mage/cards/a/AdvocateOfTheBeast.java | 3 +- .../src/mage/cards/a/AetherTradewinds.java | 3 +- .../src/mage/cards/a/AffectionateIndrik.java | 3 +- .../src/mage/cards/a/AggressiveInstinct.java | 3 +- Mage.Sets/src/mage/cards/a/AinokBondKin.java | 3 +- .../src/mage/cards/a/AinokSurvivalist.java | 3 +- .../src/mage/cards/a/AjaniMentorOfHeroes.java | 3 +- .../src/mage/cards/a/AjaniSteadfast.java | 3 +- .../mage/cards/a/AjaniStrengthOfThePride.java | 3 +- .../src/mage/cards/a/AjaniUnyielding.java | 3 +- .../src/mage/cards/a/AkoumBattlesinger.java | 3 +- Mage.Sets/src/mage/cards/a/AkroanHoplite.java | 3 +- .../src/mage/cards/a/AkronLegionnaire.java | 3 +- Mage.Sets/src/mage/cards/a/AkuDjinn.java | 3 +- .../mage/cards/a/AlelaArtfulProvocateur.java | 3 +- .../src/mage/cards/a/AllThatGlitters.java | 3 +- Mage.Sets/src/mage/cards/a/AlluringSiren.java | 3 +- Mage.Sets/src/mage/cards/a/AlphaBrawl.java | 3 +- Mage.Sets/src/mage/cards/a/AlpineMoon.java | 3 +- .../src/mage/cards/a/AltacBloodseeker.java | 3 +- Mage.Sets/src/mage/cards/a/Ambuscade.java | 3 +- .../src/mage/cards/a/AmuletOfSafekeeping.java | 3 +- .../src/mage/cards/a/AngelOfDeliverance.java | 3 +- .../src/mage/cards/a/AngelOfSanctions.java | 3 +- Mage.Sets/src/mage/cards/a/AngelicVoices.java | 3 +- Mage.Sets/src/mage/cards/a/AnglerTurtle.java | 3 +- Mage.Sets/src/mage/cards/a/AngryMob.java | 3 +- Mage.Sets/src/mage/cards/a/ApexAltisaur.java | 3 +- .../src/mage/cards/a/AppealAuthority.java | 3 +- .../mage/cards/a/ArahboRoarOfTheWorld.java | 5 +- Mage.Sets/src/mage/cards/a/ArborColossus.java | 3 +- .../src/mage/cards/a/ArcadesSabboth.java | 3 +- .../src/mage/cards/a/ArcaneLighthouse.java | 3 +- .../src/mage/cards/a/ArchangelAvacyn.java | 3 +- .../src/mage/cards/a/ArchdemonOfGreed.java | 3 +- .../mage/cards/a/ArchetypeOfAggression.java | 3 +- .../src/mage/cards/a/ArchetypeOfCourage.java | 3 +- .../mage/cards/a/ArchetypeOfEndurance.java | 3 +- .../src/mage/cards/a/ArchetypeOfFinality.java | 3 +- .../mage/cards/a/ArchetypeOfImagination.java | 3 +- .../mage/cards/a/ArchonOfTheTriumvirate.java | 3 +- Mage.Sets/src/mage/cards/a/ArenaAthlete.java | 3 +- Mage.Sets/src/mage/cards/a/ArmamentCorps.java | 3 +- .../src/mage/cards/a/ArmoredAscension.java | 3 +- .../src/mage/cards/a/AssassinsTrophy.java | 3 +- .../src/mage/cards/a/AtarkaPummeler.java | 3 +- Mage.Sets/src/mage/cards/a/Atogatog.java | 3 +- .../src/mage/cards/a/AttendantOfVraska.java | 3 +- Mage.Sets/src/mage/cards/a/AuntiesSnitch.java | 3 +- Mage.Sets/src/mage/cards/a/AuraFinesse.java | 3 +- .../mage/cards/a/AuthorityOfTheConsuls.java | 3 +- Mage.Sets/src/mage/cards/a/AysenCrusader.java | 3 +- .../mage/cards/a/AyulaQueenAmongBears.java | 3 +- .../src/mage/cards/a/AzoriusArrester.java | 3 +- .../src/mage/cards/a/AzoriusJusticiar.java | 3 +- Mage.Sets/src/mage/cards/b/BafflingEnd.java | 3 +- .../src/mage/cards/b/BanisherPriest.java | 3 +- .../src/mage/cards/b/BanishingLight.java | 3 +- .../src/mage/cards/b/BarrageOfBoulders.java | 3 +- .../src/mage/cards/b/BaruFistOfKrosa.java | 3 +- .../mage/cards/b/BeastmastersMagemark.java | 3 +- .../src/mage/cards/b/BelligerentSliver.java | 3 +- .../src/mage/cards/b/BellowingAegisaur.java | 3 +- .../src/mage/cards/b/BenthicExplorers.java | 3 +- Mage.Sets/src/mage/cards/b/Betrayal.java | 3 +- .../src/mage/cards/b/BishopOfBinding.java | 3 +- .../mage/cards/b/BishopOfTheBloodstained.java | 3 +- .../src/mage/cards/b/BlackMarketDealer.java | 3 +- .../mage/cards/b/BlessedReincarnation.java | 3 +- Mage.Sets/src/mage/cards/b/BlindingSpray.java | 3 +- .../src/mage/cards/b/BloodChinRager.java | 3 +- Mage.Sets/src/mage/cards/b/Bloodbriar.java | 3 +- .../src/mage/cards/b/BloodcrazedHoplite.java | 3 +- Mage.Sets/src/mage/cards/b/Blustersquall.java | 3 +- .../src/mage/cards/b/BoggartShenanigans.java | 3 +- Mage.Sets/src/mage/cards/b/BoilingEarth.java | 3 +- .../src/mage/cards/b/BondsOfMortality.java | 3 +- .../src/mage/cards/b/BoneyardScourge.java | 3 +- Mage.Sets/src/mage/cards/b/BoomBust.java | 5 +- .../src/mage/cards/b/BorderlandBehemoth.java | 3 +- .../src/mage/cards/b/BoundlessRealms.java | 3 +- .../src/mage/cards/b/BrazenBorrower.java | 3 +- Mage.Sets/src/mage/cards/b/BreakOpen.java | 3 +- .../src/mage/cards/b/BrutalHordechief.java | 3 +- .../src/mage/cards/b/ButcherOfMalakir.java | 2 +- Mage.Sets/src/mage/cards/c/CalmingVerse.java | 3 +- .../src/mage/cards/c/CapriciousEfreet.java | 5 +- .../src/mage/cards/c/CaptainLanneryStorm.java | 3 +- .../src/mage/cards/c/CaptivatingCrew.java | 3 +- .../mage/cards/c/CapturedByTheConsulate.java | 3 +- .../src/mage/cards/c/CarelessCelebrant.java | 3 +- Mage.Sets/src/mage/cards/c/CastOut.java | 3 +- .../src/mage/cards/c/CatacombSifter.java | 3 +- .../src/mage/cards/c/CaughtInTheBrights.java | 3 +- .../src/mage/cards/c/CavalcadeOfCalamity.java | 3 +- .../src/mage/cards/c/CavalierOfFlame.java | 3 +- .../src/mage/cards/c/ChainedToTheRocks.java | 3 +- .../mage/cards/c/ChainerNightmareAdept.java | 3 +- .../src/mage/cards/c/ChampionOfLambholt.java | 3 +- .../mage/cards/c/ChancellorOfTheForge.java | 3 +- .../src/mage/cards/c/ChandrasTriumph.java | 3 +- .../src/mage/cards/c/ChemistersTrick.java | 3 +- .../src/mage/cards/c/ChewbaccaTheBeast.java | 4 +- Mage.Sets/src/mage/cards/c/ChiefChirpa.java | 3 +- .../src/mage/cards/c/ChiefOfTheFoundry.java | 3 +- .../src/mage/cards/c/ChiseiHeartOfOceans.java | 3 +- .../src/mage/cards/c/ChromeshellCrab.java | 3 +- .../src/mage/cards/c/ChroniclerOfHeroes.java | 3 +- Mage.Sets/src/mage/cards/c/CitanulDruid.java | 3 +- .../src/mage/cards/c/ClackbridgeTroll.java | 3 +- .../src/mage/cards/c/ClawsOfValakut.java | 3 +- Mage.Sets/src/mage/cards/c/ClearShot.java | 3 +- .../mage/cards/c/ClericOfTheForwardOrder.java | 3 +- Mage.Sets/src/mage/cards/c/CloseQuarters.java | 3 +- .../src/mage/cards/c/CloudstoneCurio.java | 5 +- .../src/mage/cards/c/ConclaveTribunal.java | 3 +- .../src/mage/cards/c/ConjuredCurrency.java | 3 +- .../src/mage/cards/c/ConqueringManticore.java | 3 +- .../src/mage/cards/c/ConstrictingSliver.java | 3 +- .../src/mage/cards/c/ConsulateCrackdown.java | 3 +- .../src/mage/cards/c/ConsumingVapors.java | 3 +- .../src/mage/cards/c/ContestedCliffs.java | 5 +- .../src/mage/cards/c/CopperhoofVorrac.java | 3 +- Mage.Sets/src/mage/cards/c/Corrupt.java | 3 +- Mage.Sets/src/mage/cards/c/Counterflux.java | 3 +- .../src/mage/cards/c/CourtStreetDenizen.java | 5 +- Mage.Sets/src/mage/cards/c/CowerInFear.java | 3 +- .../src/mage/cards/c/CraterhoofBehemoth.java | 3 +- .../src/mage/cards/c/CrownedCeratok.java | 3 +- .../src/mage/cards/c/CrucibleOfFire.java | 3 +- .../src/mage/cards/c/CruelCelebrant.java | 3 +- .../src/mage/cards/c/CrusadingKnight.java | 2 +- Mage.Sets/src/mage/cards/c/Crypsis.java | 3 +- .../src/mage/cards/c/CrypticCommand.java | 3 +- .../src/mage/cards/c/CunningEvasion.java | 3 +- Mage.Sets/src/mage/cards/c/CyclonicRift.java | 3 +- .../src/mage/cards/d/DampeningPulse.java | 3 +- Mage.Sets/src/mage/cards/d/DaringThief.java | 3 +- .../src/mage/cards/d/DarkIntimations.java | 3 +- Mage.Sets/src/mage/cards/d/DarkProphecy.java | 3 +- .../src/mage/cards/d/DayOfTheDragons.java | 5 +- Mage.Sets/src/mage/cards/d/DeadGone.java | 3 +- Mage.Sets/src/mage/cards/d/DeadMansChest.java | 3 +- .../src/mage/cards/d/DeadeyePlunderers.java | 3 +- .../src/mage/cards/d/DeathPitOffering.java | 3 +- .../src/mage/cards/d/DeceiverExarch.java | 3 +- Mage.Sets/src/mage/cards/d/DeepSeaKraken.java | 3 +- Mage.Sets/src/mage/cards/d/DeeprootElite.java | 5 +- .../src/mage/cards/d/DeepwaterHypnotist.java | 3 +- .../src/mage/cards/d/DefiantGreatmaw.java | 3 +- .../src/mage/cards/d/DeputyOfAcquittals.java | 3 +- .../src/mage/cards/d/DeputyOfDetention.java | 3 +- .../src/mage/cards/d/DesecrationDemon.java | 3 +- .../src/mage/cards/d/DesolationAngel.java | 3 +- .../src/mage/cards/d/DesolationGiant.java | 3 +- .../src/mage/cards/d/DictateOfErebos.java | 3 +- .../src/mage/cards/d/DinosaurStampede.java | 3 +- .../mage/cards/d/DireFleetNeckbreaker.java | 3 +- .../src/mage/cards/d/DireFleetPoisoner.java | 3 +- .../src/mage/cards/d/DisasterRadius.java | 3 +- .../src/mage/cards/d/DismissIntoDream.java | 3 +- Mage.Sets/src/mage/cards/d/DivineLight.java | 3 +- .../src/mage/cards/d/DocentOfPerfection.java | 3 +- Mage.Sets/src/mage/cards/d/Dogpile.java | 3 +- .../src/mage/cards/d/DomriAnarchOfBolas.java | 3 +- Mage.Sets/src/mage/cards/d/DomrisAmbush.java | 3 +- .../src/mage/cards/d/DongZhouTheTyrant.java | 3 +- Mage.Sets/src/mage/cards/d/DoomedArtisan.java | 3 +- Mage.Sets/src/mage/cards/d/DoomwakeGiant.java | 3 +- Mage.Sets/src/mage/cards/d/Downsize.java | 3 +- .../src/mage/cards/d/DragonloftIdol.java | 3 +- .../src/mage/cards/d/DragonlordAtarka.java | 3 +- .../src/mage/cards/d/DragonscaleGeneral.java | 3 +- .../src/mage/cards/d/DramaticReversal.java | 3 +- .../mage/cards/d/DranaLiberatorOfMalakir.java | 3 +- .../src/mage/cards/d/DreadCacodemon.java | 5 +- Mage.Sets/src/mage/cards/d/DreadCharge.java | 2 +- .../src/mage/cards/d/DreadhordeInvasion.java | 3 +- Mage.Sets/src/mage/cards/d/Dreadwaters.java | 3 +- Mage.Sets/src/mage/cards/d/DreamEater.java | 3 +- .../src/mage/cards/d/DreamcallerSiren.java | 3 +- .../src/mage/cards/d/DriftOfTheDead.java | 3 +- .../src/mage/cards/d/DromokasCommand.java | 3 +- Mage.Sets/src/mage/cards/d/DualCasting.java | 3 +- Mage.Sets/src/mage/cards/d/DungeonGeists.java | 3 +- .../src/mage/cards/e/EarlOfSquirrel.java | 2 +- Mage.Sets/src/mage/cards/e/EarthServant.java | 3 +- Mage.Sets/src/mage/cards/e/EbonyHorse.java | 3 +- .../src/mage/cards/e/EchoBaseCommando.java | 3 +- Mage.Sets/src/mage/cards/e/Electrickery.java | 3 +- .../src/mage/cards/e/EmissaryOfHope.java | 3 +- Mage.Sets/src/mage/cards/e/EmmaraTandris.java | 3 +- Mage.Sets/src/mage/cards/e/EmpyreanEagle.java | 3 +- Mage.Sets/src/mage/cards/e/Endure.java | 3 +- .../src/mage/cards/e/EntanglingTrap.java | 3 +- .../src/mage/cards/e/EnthrallingVictor.java | 3 +- .../src/mage/cards/e/EpicConfrontation.java | 3 +- Mage.Sets/src/mage/cards/e/ErebossTitan.java | 3 +- Mage.Sets/src/mage/cards/e/ErhnamDjinn.java | 3 +- Mage.Sets/src/mage/cards/e/EscapeRoutes.java | 3 +- .../src/mage/cards/e/EtchingsOfTheChosen.java | 3 +- Mage.Sets/src/mage/cards/e/EternalThirst.java | 3 +- Mage.Sets/src/mage/cards/e/EtherealArmor.java | 3 +- .../src/mage/cards/e/EvilEyeOfOrmsByGore.java | 3 +- .../src/mage/cards/e/EvilEyeOfUrborg.java | 3 +- .../mage/cards/e/EvolutionaryEscalation.java | 3 +- .../mage/cards/e/ExavaRakdosBloodWitch.java | 3 +- .../src/mage/cards/e/ExtraplanarLens.java | 3 +- .../src/mage/cards/e/EyeblightAssassin.java | 3 +- .../src/mage/cards/e/EzurisPredation.java | 3 +- .../src/mage/cards/f/FaerieArtisans.java | 3 +- .../src/mage/cards/f/FaerieMiscreant.java | 3 +- .../src/mage/cards/f/FairgroundsWarden.java | 3 +- Mage.Sets/src/mage/cards/f/FaithUnbroken.java | 3 +- .../mage/cards/f/FathomFleetCutthroat.java | 3 +- .../src/mage/cards/f/FencersMagemark.java | 3 +- .../src/mage/cards/f/FerocityOfTheWilds.java | 3 +- Mage.Sets/src/mage/cards/f/FesteringNewt.java | 3 +- Mage.Sets/src/mage/cards/f/FieldOfRuin.java | 3 +- Mage.Sets/src/mage/cards/f/FieldOfSouls.java | 3 +- .../src/mage/cards/f/FinalIteration.java | 3 +- Mage.Sets/src/mage/cards/f/Finn.java | 3 +- .../src/mage/cards/f/FiresOfYavimaya.java | 3 +- Mage.Sets/src/mage/cards/f/Flutterfox.java | 3 +- .../src/mage/cards/f/FoeRazerRegent.java | 3 +- Mage.Sets/src/mage/cards/f/Fogwalker.java | 3 +- Mage.Sets/src/mage/cards/f/ForceStasis.java | 3 +- .../cards/f/ForerunnerOfTheCoalition.java | 3 +- .../mage/cards/f/ForerunnerOfTheEmpire.java | 3 +- .../mage/cards/f/ForerunnerOfTheHeralds.java | 3 +- .../mage/cards/f/ForerunnerOfTheLegion.java | 3 +- .../src/mage/cards/f/FoulTongueShriek.java | 3 +- Mage.Sets/src/mage/cards/f/FoundryHornet.java | 3 +- .../mage/cards/f/FoundryStreetDenizen.java | 3 +- Mage.Sets/src/mage/cards/f/FrontierSiege.java | 5 +- .../src/mage/cards/f/FumikoTheLowblood.java | 3 +- Mage.Sets/src/mage/cards/g/GOTOJAIL.java | 3 +- .../src/mage/cards/g/GadwickTheWizened.java | 3 +- Mage.Sets/src/mage/cards/g/GaeasAvenger.java | 3 +- .../src/mage/cards/g/GalecasterColossus.java | 3 +- .../mage/cards/g/GamorreanPrisonGuard.java | 3 +- .../mage/cards/g/GargosViciousWatcher.java | 3 +- .../src/mage/cards/g/GateToTheAfterlife.java | 3 +- .../src/mage/cards/g/GauntletsOfChaos.java | 3 +- .../src/mage/cards/g/GavonyUnhallowed.java | 3 +- Mage.Sets/src/mage/cards/g/Geistblast.java | 3 +- Mage.Sets/src/mage/cards/g/GeneralHux.java | 5 +- Mage.Sets/src/mage/cards/g/Ghostway.java | 3 +- .../src/mage/cards/g/GideonBattleForged.java | 3 +- .../src/mage/cards/g/GideonsAvenger.java | 3 +- Mage.Sets/src/mage/cards/g/GildedDrake.java | 3 +- Mage.Sets/src/mage/cards/g/GlacialChasm.java | 3 +- Mage.Sets/src/mage/cards/g/GlaringAegis.java | 3 +- Mage.Sets/src/mage/cards/g/GlassdustHulk.java | 3 +- Mage.Sets/src/mage/cards/g/GlazeFiend.java | 3 +- Mage.Sets/src/mage/cards/g/GlintHawkIdol.java | 4 +- Mage.Sets/src/mage/cards/g/Glorybringer.java | 3 +- .../src/mage/cards/g/GoblinChainwhirler.java | 3 +- Mage.Sets/src/mage/cards/g/GoblinKites.java | 3 +- .../src/mage/cards/g/GoblinRabblemaster.java | 3 +- .../src/mage/cards/g/GoblinWarDrums.java | 3 +- .../src/mage/cards/g/GoblinWarStrike.java | 3 +- Mage.Sets/src/mage/cards/g/GoldenDemise.java | 3 +- .../src/mage/cards/g/GolgariGermination.java | 3 +- .../src/mage/cards/g/GontisAetherHeart.java | 2 +- Mage.Sets/src/mage/cards/g/GraniteGrip.java | 3 +- Mage.Sets/src/mage/cards/g/GreatbowDoyen.java | 3 +- .../src/mage/cards/g/GreaterAuramancy.java | 5 +- Mage.Sets/src/mage/cards/g/GrimContest.java | 2 +- Mage.Sets/src/mage/cards/g/GrimHaruspex.java | 3 +- Mage.Sets/src/mage/cards/g/GrowingRanks.java | 3 +- Mage.Sets/src/mage/cards/g/GruesomeFate.java | 3 - .../src/mage/cards/g/GruulRagebeast.java | 3 +- Mage.Sets/src/mage/cards/g/GruulWarChant.java | 3 +- .../src/mage/cards/g/GuardianOfTazeem.java | 3 +- .../src/mage/cards/g/GuardiansMagemark.java | 3 +- Mage.Sets/src/mage/cards/g/GuildSummit.java | 3 +- .../src/mage/cards/g/GustcloakSavior.java | 3 +- .../src/mage/cards/g/GwafaHazidProfiteer.java | 3 +- .../src/mage/cards/h/HaazdaSnareSquad.java | 3 +- .../src/mage/cards/h/HagraDiabolist.java | 3 +- Mage.Sets/src/mage/cards/h/HailStorm.java | 3 - .../src/mage/cards/h/HalimarExcavator.java | 3 +- Mage.Sets/src/mage/cards/h/HanSolo.java | 3 +- .../src/mage/cards/h/HandsOfBinding.java | 3 +- .../mage/cards/h/HaphazardBombardment.java | 7 +- .../src/mage/cards/h/HarbingerOfTheTides.java | 3 +- .../src/mage/cards/h/HarmonyOfNature.java | 3 +- Mage.Sets/src/mage/cards/h/HateMirage.java | 3 +- Mage.Sets/src/mage/cards/h/HeavyInfantry.java | 3 +- .../src/mage/cards/h/HeliodsEmissary.java | 3 +- .../src/mage/cards/h/HellkiteIgniter.java | 3 +- Mage.Sets/src/mage/cards/h/HelmOfTheGods.java | 3 +- Mage.Sets/src/mage/cards/h/Helvault.java | 3 +- .../src/mage/cards/h/HeraldOfLeshrac.java | 3 +- Mage.Sets/src/mage/cards/h/HerosBlade.java | 3 +- .../src/mage/cards/h/HiddenDragonslayer.java | 3 +- .../src/mage/cards/h/HiddenPredators.java | 3 +- .../src/mage/cards/h/HieromancersCage.java | 3 +- .../src/mage/cards/h/HighlandBerserker.java | 3 +- Mage.Sets/src/mage/cards/h/Hivestone.java | 3 +- .../src/mage/cards/h/HivisOfTheScale.java | 3 +- .../mage/cards/h/HuatliDinosaurKnight.java | 7 +- .../src/mage/cards/h/HuatlisSpurring.java | 3 +- .../src/mage/cards/h/HungryDragonsnake.java | 3 +- Mage.Sets/src/mage/cards/h/HuntTheHunter.java | 3 +- Mage.Sets/src/mage/cards/h/HuntTheWeak.java | 3 +- .../src/mage/cards/h/HunterOfEyeblights.java | 3 +- .../src/mage/cards/h/HyperionBlacksmith.java | 3 +- .../src/mage/cards/h/HystericalBlindness.java | 3 +- .../cards/i/IbHalfheartGoblinTactician.java | 3 +- Mage.Sets/src/mage/cards/i/IcefallRegent.java | 2 +- .../src/mage/cards/i/IconOfAncestry.java | 4 +- Mage.Sets/src/mage/cards/i/IllusoryGains.java | 3 +- .../src/mage/cards/i/ImperialAerosaur.java | 3 +- .../src/mage/cards/i/ImpetuousProtege.java | 3 +- Mage.Sets/src/mage/cards/i/InGarruksWake.java | 3 +- .../src/mage/cards/i/InactionInjunction.java | 3 +- Mage.Sets/src/mage/cards/i/InciteWar.java | 3 +- .../src/mage/cards/i/IncreasingVengeance.java | 3 +- .../src/mage/cards/i/IndebtedSamurai.java | 3 +- .../src/mage/cards/i/InfernalDenizen.java | 3 +- .../mage/cards/i/InfiltratorsMagemark.java | 3 +- .../src/mage/cards/i/InvertTheSkies.java | 3 +- .../src/mage/cards/i/IroasGodOfVictory.java | 3 +- .../mage/cards/i/IshiIshiAkkiCrackshot.java | 3 +- Mage.Sets/src/mage/cards/i/IsolationZone.java | 3 +- .../src/mage/cards/i/IsperiasSkywatch.java | 3 +- .../src/mage/cards/i/IxalansBinding.java | 3 +- .../src/mage/cards/i/IzzetGuildmage.java | 5 +- Mage.Sets/src/mage/cards/j/JacesSentinel.java | 3 +- .../src/mage/cards/j/JaddiLifestrider.java | 3 +- Mage.Sets/src/mage/cards/j/JadeBearer.java | 3 +- Mage.Sets/src/mage/cards/j/JediKnight.java | 3 +- Mage.Sets/src/mage/cards/j/JediSentinel.java | 3 +- .../src/mage/cards/j/JediStarfighter.java | 3 +- .../src/mage/cards/j/JeskaiBarricade.java | 3 +- .../src/mage/cards/j/JhoirasTimebug.java | 3 +- Mage.Sets/src/mage/cards/j/JoragaBard.java | 3 +- .../src/mage/cards/j/JoragaWarcaller.java | 3 +- Mage.Sets/src/mage/cards/j/Joust.java | 3 +- .../mage/cards/j/JudithTheScourgeDiva.java | 3 +- .../mage/cards/j/JuniperOrderAdvocate.java | 3 +- .../src/mage/cards/k/KalastriaHighborn.java | 3 +- Mage.Sets/src/mage/cards/k/KalonianHydra.java | 3 +- .../src/mage/cards/k/KapshoKitefins.java | 5 +- Mage.Sets/src/mage/cards/k/KavuRunner.java | 3 +- .../src/mage/cards/k/KayasGhostform.java | 3 +- Mage.Sets/src/mage/cards/k/KazuulWarlord.java | 3 +- .../src/mage/cards/k/KeeperOfTheLens.java | 3 +- .../src/mage/cards/k/KeepsakeGorgon.java | 3 +- .../src/mage/cards/k/KefnetsMonument.java | 3 +- .../src/mage/cards/k/KestiaTheCultivator.java | 3 +- .../src/mage/cards/k/KheruBloodsucker.java | 3 +- Mage.Sets/src/mage/cards/k/KiAdiMundi.java | 3 +- .../mage/cards/k/KioraTheCrashingWave.java | 3 +- .../src/mage/cards/k/KithkinGreatheart.java | 3 +- .../src/mage/cards/k/KnightExemplar.java | 3 +- .../src/mage/cards/k/KnuckleboneWitch.java | 3 +- .../src/mage/cards/k/KoboldTaskmaster.java | 3 +- .../mage/cards/k/KolaghanTheStormsFury.java | 3 +- Mage.Sets/src/mage/cards/k/KorEntanglers.java | 3 +- Mage.Sets/src/mage/cards/k/KorHookmaster.java | 3 +- .../src/mage/cards/k/KothOfTheHammer.java | 3 +- .../src/mage/cards/k/KraulHarpooner.java | 3 +- .../src/mage/cards/k/KukemssaSerpent.java | 3 +- Mage.Sets/src/mage/cards/k/KulrathKnight.java | 3 +- .../src/mage/cards/l/LandbindRitual.java | 3 +- .../src/mage/cards/l/LandoCalrissian.java | 3 +- Mage.Sets/src/mage/cards/l/Landslide.java | 3 +- Mage.Sets/src/mage/cards/l/Lashwrithe.java | 3 +- .../src/mage/cards/l/LaviniaOfTheTenth.java | 3 +- .../src/mage/cards/l/LeagueGuildmage.java | 5 +- Mage.Sets/src/mage/cards/l/LedevChampion.java | 3 +- .../src/mage/cards/l/LeechingSliver.java | 3 +- .../src/mage/cards/l/LegionLieutenant.java | 3 +- .../src/mage/cards/l/LegionsInitiative.java | 3 +- Mage.Sets/src/mage/cards/l/LensOfClarity.java | 3 +- .../src/mage/cards/l/LeoninArmorguard.java | 3 +- .../src/mage/cards/l/LeoninIconoclast.java | 3 +- .../src/mage/cards/l/LeylineOfSanctity.java | 3 +- Mage.Sets/src/mage/cards/l/Lifeblood.java | 3 +- .../src/mage/cards/l/LifecraftAwakening.java | 4 +- Mage.Sets/src/mage/cards/l/Lifetap.java | 3 +- .../src/mage/cards/l/LightFromWithin.java | 3 +- .../src/mage/cards/l/LightningCoils.java | 3 +- .../cards/l/LilianaDreadhordeGeneral.java | 3 +- .../mage/cards/l/LilianaHereticalHealer.java | 3 +- .../mage/cards/l/LilianaOfTheDarkRealms.java | 3 +- .../src/mage/cards/l/LilianasInfluence.java | 3 +- .../mage/cards/l/LimDulTheNecromancer.java | 3 +- .../mage/cards/l/LlawanCephalidEmpress.java | 3 +- .../src/mage/cards/l/LoathsomeCatoblepas.java | 3 +- Mage.Sets/src/mage/cards/l/LongshotSquad.java | 3 +- Mage.Sets/src/mage/cards/l/LowlandOaf.java | 3 +- .../src/mage/cards/l/LoxodonHierarch.java | 3 - .../src/mage/cards/l/LoyalGyrfalcon.java | 3 +- .../src/mage/cards/l/LurkingChupacabra.java | 3 +- Mage.Sets/src/mage/cards/l/LyevDecree.java | 3 +- Mage.Sets/src/mage/cards/l/LyevSkyknight.java | 3 +- Mage.Sets/src/mage/cards/m/MaceWindu.java | 3 +- Mage.Sets/src/mage/cards/m/MaddeningImp.java | 5 +- .../src/mage/cards/m/MaelstromWanderer.java | 3 +- .../src/mage/cards/m/MagusOfTheUnseen.java | 3 +- .../src/mage/cards/m/MalakirCullblade.java | 3 +- Mage.Sets/src/mage/cards/m/ManaGeyser.java | 3 +- .../src/mage/cards/m/MaraudingKnight.java | 3 +- .../src/mage/cards/m/MarduAscendancy.java | 3 +- Mage.Sets/src/mage/cards/m/MarkForDeath.java | 3 +- .../src/mage/cards/m/MarshalingTheTroops.java | 3 +- .../src/mage/cards/m/MarshdrinkerGiant.java | 3 +- Mage.Sets/src/mage/cards/m/MartialLaw.java | 3 +- .../src/mage/cards/m/MasterOfEtherium.java | 3 +- .../src/mage/cards/m/MasterWarcraft.java | 10 +-- .../src/mage/cards/m/MathasFiendSeeker.java | 3 +- .../src/mage/cards/m/MausoleumHarpy.java | 3 +- .../src/mage/cards/m/MausoleumWanderer.java | 3 +- .../mage/cards/m/MavrenFeinDuskApostle.java | 3 +- .../src/mage/cards/m/MawOfTheObzedat.java | 3 +- .../mage/cards/m/MengHuoBarbarianKing.java | 3 +- .../src/mage/cards/m/MephidrossVampire.java | 3 +- .../src/mage/cards/m/MerEkNightblade.java | 3 +- .../src/mage/cards/m/MerenOfClanNelToth.java | 3 +- .../src/mage/cards/m/MerfolkMistbinder.java | 3 +- .../src/mage/cards/m/MerrowReejerey.java | 3 +- Mage.Sets/src/mage/cards/m/Metamorphose.java | 3 +- Mage.Sets/src/mage/cards/m/MeteorGolem.java | 3 +- .../src/mage/cards/m/MidnightEntourage.java | 3 +- .../src/mage/cards/m/MidnightReaper.java | 3 +- .../src/mage/cards/m/MightMakesRight.java | 3 +- Mage.Sets/src/mage/cards/m/MindSludge.java | 3 +- .../src/mage/cards/m/MindwrackLiege.java | 5 +- .../src/mage/cards/m/MinisterOfPain.java | 3 +- Mage.Sets/src/mage/cards/m/MiresToll.java | 3 +- Mage.Sets/src/mage/cards/m/Mirrorpool.java | 3 +- .../src/mage/cards/m/MizziumMortars.java | 3 +- Mage.Sets/src/mage/cards/m/MizziumSkin.java | 3 - .../src/mage/cards/m/MobilizedDistrict.java | 3 +- Mage.Sets/src/mage/cards/m/MoonlightHunt.java | 3 +- .../src/mage/cards/m/MoonlitScavengers.java | 3 +- .../mage/cards/m/MorophonTheBoundless.java | 3 +- Mage.Sets/src/mage/cards/m/MuYanling.java | 3 +- .../mage/cards/m/MuYanlingCelestialWind.java | 3 +- .../src/mage/cards/m/MunitionsExpert.java | 3 +- .../src/mage/cards/m/MurasaPyromancer.java | 3 +- Mage.Sets/src/mage/cards/m/MutantsPrey.java | 5 +- Mage.Sets/src/mage/cards/m/Mutilate.java | 3 +- Mage.Sets/src/mage/cards/m/Mutiny.java | 3 +- .../src/mage/cards/m/MyojinOfSeeingWinds.java | 3 +- .../src/mage/cards/m/MystifyingMaze.java | 3 +- Mage.Sets/src/mage/cards/n/NamelessRace.java | 3 +- .../src/mage/cards/n/NantukoBlightcutter.java | 3 +- .../mage/cards/n/NaruMehaMasterWizard.java | 5 +- Mage.Sets/src/mage/cards/n/NaturesWay.java | 3 +- .../mage/cards/n/NazahnReveredBladesmith.java | 3 +- .../src/mage/cards/n/NebelgastHerald.java | 5 +- .../mage/cards/n/NecromancersMagemark.java | 3 +- .../src/mage/cards/n/NeedletoothRaptor.java | 3 +- .../src/mage/cards/n/NehebTheWorthy.java | 3 +- Mage.Sets/src/mage/cards/n/NettlingImp.java | 3 +- .../src/mage/cards/n/NewPrahvGuildmage.java | 3 +- Mage.Sets/src/mage/cards/n/NiblisOfFrost.java | 3 +- .../mage/cards/n/NicolBolasGodPharaoh.java | 3 +- .../src/mage/cards/n/NightmareIncursion.java | 3 +- Mage.Sets/src/mage/cards/n/NightmareLash.java | 3 +- .../mage/cards/n/NimbleObstructionist.java | 3 +- .../src/mage/cards/n/NinthBridgePatrol.java | 3 +- .../src/mage/cards/n/NissaVitalForce.java | 3 +- .../mage/cards/n/NissaVoiceOfZendikar.java | 3 +- .../src/mage/cards/n/NissasJudgment.java | 5 +- .../src/mage/cards/n/NivixGuildmage.java | 3 +- .../src/mage/cards/n/NivmagusElemental.java | 3 +- Mage.Sets/src/mage/cards/n/Norritt.java | 3 +- .../src/mage/cards/n/NotOfThisWorld.java | 3 +- Mage.Sets/src/mage/cards/o/OathOfChandra.java | 3 +- .../mage/cards/o/OathOfTheAncientWood.java | 3 +- .../src/mage/cards/o/OgreBattledriver.java | 3 +- .../src/mage/cards/o/OgreGeargrabber.java | 3 +- .../src/mage/cards/o/OjutaiSoulOfWinter.java | 5 +- .../src/mage/cards/o/OliviaVoldaren.java | 3 +- Mage.Sets/src/mage/cards/o/OminousSphinx.java | 3 +- .../src/mage/cards/o/OmnathLocusOfRage.java | 3 +- Mage.Sets/src/mage/cards/o/OnduCleric.java | 3 +- .../src/mage/cards/o/OneEyedScarecrow.java | 3 +- Mage.Sets/src/mage/cards/o/OpenTheGraves.java | 3 +- .../src/mage/cards/o/OpportunisticDragon.java | 3 +- Mage.Sets/src/mage/cards/o/OrcSureshot.java | 3 +- Mage.Sets/src/mage/cards/o/Order66.java | 3 +- .../src/mage/cards/o/OreskosExplorer.java | 3 +- Mage.Sets/src/mage/cards/o/OrzhovPontiff.java | 5 +- Mage.Sets/src/mage/cards/o/Outmuscle.java | 3 +- .../src/mage/cards/o/OvalchaseDaredevil.java | 3 +- .../src/mage/cards/o/OverseerOfTheDamned.java | 4 +- Mage.Sets/src/mage/cards/p/PalaceJailer.java | 3 +- .../src/mage/cards/p/PalliationAccord.java | 3 +- .../src/mage/cards/p/PallidMycoderm.java | 3 +- .../mage/cards/p/ParagonOfEternalWilds.java | 3 +- .../mage/cards/p/ParagonOfGatheringMists.java | 3 +- .../src/mage/cards/p/ParagonOfNewDawns.java | 5 +- Mage.Sets/src/mage/cards/p/PashalikMons.java | 3 +- Mage.Sets/src/mage/cards/p/PathOfBravery.java | 3 +- .../src/mage/cards/p/PatronOfTheVein.java | 3 +- .../src/mage/cards/p/PeelFromReality.java | 3 +- .../src/mage/cards/p/PendelhavenElder.java | 3 +- .../src/mage/cards/p/PerilousVoyage.java | 3 +- .../src/mage/cards/p/PhantomGeneral.java | 3 +- .../src/mage/cards/p/PheresBandWarchief.java | 3 +- .../src/mage/cards/p/PiratesCutlass.java | 3 +- .../src/mage/cards/p/PitilessPlunderer.java | 3 +- Mage.Sets/src/mage/cards/p/PlagueBelcher.java | 3 +- Mage.Sets/src/mage/cards/p/PlagueWind.java | 3 +- Mage.Sets/src/mage/cards/p/PlanarOverlay.java | 3 +- Mage.Sets/src/mage/cards/p/PoeDameron.java | 5 +- .../src/mage/cards/p/PoliticalTrickery.java | 3 +- Mage.Sets/src/mage/cards/p/PollutedBonds.java | 4 +- .../src/mage/cards/p/PolymorphousRush.java | 2 - .../src/mage/cards/p/PontiffOfBlight.java | 3 +- Mage.Sets/src/mage/cards/p/Pounce.java | 3 +- .../src/mage/cards/p/PredatoryRampage.java | 3 +- Mage.Sets/src/mage/cards/p/PrepareFight.java | 4 +- Mage.Sets/src/mage/cards/p/PreyUpon.java | 3 +- Mage.Sets/src/mage/cards/p/PrimalBellow.java | 3 +- .../src/mage/cards/p/PrimalForcemage.java | 3 +- .../src/mage/cards/p/PrimevalProtector.java | 3 +- Mage.Sets/src/mage/cards/p/PrisonRealm.java | 3 +- Mage.Sets/src/mage/cards/p/PrisonTerm.java | 3 +- .../src/mage/cards/p/ProfanerOfTheDead.java | 3 +- Mage.Sets/src/mage/cards/p/ProfitLoss.java | 3 +- .../src/mage/cards/p/PromiseOfBunrei.java | 3 +- Mage.Sets/src/mage/cards/p/Provoke.java | 3 +- .../src/mage/cards/p/PublicExecution.java | 3 +- Mage.Sets/src/mage/cards/p/PucasMischief.java | 3 +- Mage.Sets/src/mage/cards/p/PygmyKavu.java | 3 +- Mage.Sets/src/mage/cards/p/PyreheartWolf.java | 3 +- Mage.Sets/src/mage/cards/q/QuagSickness.java | 3 +- .../src/mage/cards/q/QuarantineField.java | 3 +- .../mage/cards/q/QuestForTheGoblinLord.java | 3 +- .../src/mage/cards/q/QuicksilverFountain.java | 3 +- .../src/mage/cards/q/QuietContemplation.java | 3 +- Mage.Sets/src/mage/cards/r/RabidBite.java | 3 +- .../src/mage/cards/r/RadiantDestiny.java | 3 +- Mage.Sets/src/mage/cards/r/RageForger.java | 3 +- .../src/mage/cards/r/RagebloodShaman.java | 3 +- .../src/mage/cards/r/RakshaGoldenCub.java | 3 +- Mage.Sets/src/mage/cards/r/RallyOfWings.java | 3 +- .../src/mage/cards/r/RalsStaticaster.java | 3 +- Mage.Sets/src/mage/cards/r/RavagerWurm.java | 3 +- .../src/mage/cards/r/RavenousChupacabra.java | 3 +- Mage.Sets/src/mage/cards/r/RayOfCommand.java | 3 +- .../src/mage/cards/r/ReachOfBranches.java | 3 +- Mage.Sets/src/mage/cards/r/RecklessRage.java | 3 +- Mage.Sets/src/mage/cards/r/ReflectorMage.java | 3 +- Mage.Sets/src/mage/cards/r/RegalCaracal.java | 3 +- Mage.Sets/src/mage/cards/r/RegisaurAlpha.java | 3 +- Mage.Sets/src/mage/cards/r/RelicBind.java | 3 +- Mage.Sets/src/mage/cards/r/RequiemAngel.java | 3 +- Mage.Sets/src/mage/cards/r/RevelInRiches.java | 3 +- .../src/mage/cards/r/RewardsOfDiversity.java | 3 +- .../src/mage/cards/r/RhythmOfTheWild.java | 3 +- Mage.Sets/src/mage/cards/r/RiftElemental.java | 3 +- Mage.Sets/src/mage/cards/r/RiotControl.java | 3 +- .../src/mage/cards/r/RiseOfTheHobgoblins.java | 3 +- .../src/mage/cards/r/RishadanPawnshop.java | 5 +- .../src/mage/cards/r/RisingPopulace.java | 3 +- Mage.Sets/src/mage/cards/r/RiteOfUndoing.java | 5 +- Mage.Sets/src/mage/cards/r/RiverSneak.java | 3 +- .../src/mage/cards/r/RohgahhOfKherKeep.java | 3 +- Mage.Sets/src/mage/cards/r/RoilingWaters.java | 3 +- .../src/mage/cards/r/RoilmagesTrick.java | 3 +- Mage.Sets/src/mage/cards/r/RootsOfLife.java | 5 +- Mage.Sets/src/mage/cards/r/RotShambler.java | 3 +- .../src/mage/cards/r/RumblingAftershocks.java | 3 +- Mage.Sets/src/mage/cards/s/SabaccGame.java | 2 +- .../src/mage/cards/s/SacredWhiteDeer.java | 3 +- .../src/mage/cards/s/SagesRowDenizen.java | 3 +- .../src/mage/cards/s/SaiOfTheShinobi.java | 3 +- Mage.Sets/src/mage/cards/s/SalvageTrader.java | 5 +- Mage.Sets/src/mage/cards/s/Sanctimony.java | 3 +- Mage.Sets/src/mage/cards/s/SapphireCharm.java | 3 +- Mage.Sets/src/mage/cards/s/SapphireDrake.java | 3 +- .../src/mage/cards/s/SarkhansUnsealing.java | 3 +- .../src/mage/cards/s/SavageOffensive.java | 3 +- Mage.Sets/src/mage/cards/s/SavagePunch.java | 3 +- Mage.Sets/src/mage/cards/s/SavageSmash.java | 3 +- Mage.Sets/src/mage/cards/s/SavageStomp.java | 3 +- Mage.Sets/src/mage/cards/s/SavageSwipe.java | 3 +- Mage.Sets/src/mage/cards/s/ScabClanGiant.java | 3 +- Mage.Sets/src/mage/cards/s/ScionOfOona.java | 5 +- .../src/mage/cards/s/ScourgeOfFleets.java | 3 +- .../src/mage/cards/s/ScourgeOfGeierReach.java | 3 +- Mage.Sets/src/mage/cards/s/ScouringSands.java | 3 +- Mage.Sets/src/mage/cards/s/SealAway.java | 3 +- .../src/mage/cards/s/SeascapeAerialist.java | 3 +- Mage.Sets/src/mage/cards/s/Seasinger.java | 5 +- .../src/mage/cards/s/SekKuarDeathkeeper.java | 3 +- .../src/mage/cards/s/SelfInflictedWound.java | 3 +- .../src/mage/cards/s/SettleBeyondReality.java | 3 +- .../src/mage/cards/s/ShamanOfThePack.java | 3 +- .../src/mage/cards/s/ShamblingGoblin.java | 3 +- Mage.Sets/src/mage/cards/s/ShamblingSuit.java | 3 +- .../src/mage/cards/s/ShatteredAngel.java | 3 +- .../src/mage/cards/s/ShelteringAncient.java | 3 +- Mage.Sets/src/mage/cards/s/ShieldMare.java | 3 +- .../src/mage/cards/s/ShipwreckSinger.java | 3 +- .../src/mage/cards/s/ShorelineSalvager.java | 3 +- Mage.Sets/src/mage/cards/s/Showstopper.java | 3 +- .../src/mage/cards/s/ShrewdHatchling.java | 5 +- .../src/mage/cards/s/ShrewdNegotiation.java | 3 +- Mage.Sets/src/mage/cards/s/SiegeDragon.java | 3 +- .../src/mage/cards/s/SifterOfSkulls.java | 3 +- .../mage/cards/s/SightOfTheScalelords.java | 3 +- Mage.Sets/src/mage/cards/s/Silkwrap.java | 3 +- .../src/mage/cards/s/SilumgarAssassin.java | 3 +- .../src/mage/cards/s/SilumgarScavenger.java | 3 +- .../cards/s/SilumgarTheDriftingDeath.java | 3 +- .../src/mage/cards/s/SireOfStagnation.java | 3 +- Mage.Sets/src/mage/cards/s/SkirkAlarmist.java | 3 +- Mage.Sets/src/mage/cards/s/SkittishKavu.java | 3 +- Mage.Sets/src/mage/cards/s/Skulduggery.java | 3 +- .../src/mage/cards/s/SkylineCascade.java | 3 +- .../cards/s/SkysovereignConsulFlagship.java | 3 +- .../src/mage/cards/s/SlitheryStalker.java | 3 +- Mage.Sets/src/mage/cards/s/SludgeStrider.java | 2 +- .../mage/cards/s/SmeltWardGatekeepers.java | 3 +- Mage.Sets/src/mage/cards/s/SmogElemental.java | 3 +- Mage.Sets/src/mage/cards/s/SoldeviGolem.java | 3 +- .../src/mage/cards/s/SomberwaldAlpha.java | 3 +- .../src/mage/cards/s/SomberwaldStag.java | 3 +- .../src/mage/cards/s/SoulswornSpirit.java | 3 +- .../src/mage/cards/s/SoultetherGolem.java | 3 +- Mage.Sets/src/mage/cards/s/Spawnbroker.java | 3 +- Mage.Sets/src/mage/cards/s/SpectralGrasp.java | 3 +- .../src/mage/cards/s/SpectralShepherd.java | 3 +- Mage.Sets/src/mage/cards/s/SpellSyphon.java | 3 +- Mage.Sets/src/mage/cards/s/SpinalEmbrace.java | 3 +- Mage.Sets/src/mage/cards/s/SpireBarrage.java | 3 +- .../src/mage/cards/s/SpiresOfOrazca.java | 3 +- Mage.Sets/src/mage/cards/s/SpiritFlare.java | 3 +- .../src/mage/cards/s/SpiritualAsylum.java | 3 +- .../src/mage/cards/s/SpiritualSanctuary.java | 3 +- .../src/mage/cards/s/SporesowerThallid.java | 3 +- .../src/mage/cards/s/SpringCleaning.java | 3 +- .../src/mage/cards/s/StalkingVengeance.java | 3 +- .../src/mage/cards/s/StarfieldOfNyx.java | 5 +- Mage.Sets/src/mage/cards/s/StasisSnare.java | 3 +- Mage.Sets/src/mage/cards/s/SteelOverseer.java | 3 +- .../src/mage/cards/s/StensiaInnkeeper.java | 3 +- Mage.Sets/src/mage/cards/s/Stingscourger.java | 3 +- .../src/mage/cards/s/StitchedMangler.java | 3 +- .../src/mage/cards/s/StoneHavenOutfitter.java | 3 +- .../src/mage/cards/s/StonehoofChieftain.java | 3 +- .../src/mage/cards/s/StoneshockGiant.java | 3 +- Mage.Sets/src/mage/cards/s/StreetSpasm.java | 3 +- .../src/mage/cards/s/StromkirkCondemned.java | 3 +- .../src/mage/cards/s/SubjugatorAngel.java | 3 +- Mage.Sets/src/mage/cards/s/SultaiFlayer.java | 3 +- Mage.Sets/src/mage/cards/s/SwiftKick.java | 2 +- Mage.Sets/src/mage/cards/s/SwiftWarden.java | 3 +- Mage.Sets/src/mage/cards/s/SynodSanctum.java | 3 +- .../src/mage/cards/t/TacticalAdvantage.java | 3 +- Mage.Sets/src/mage/cards/t/TailSlash.java | 3 +- Mage.Sets/src/mage/cards/t/TajuruArcher.java | 3 +- .../mage/cards/t/TawnosUrzasApprentice.java | 3 +- Mage.Sets/src/mage/cards/t/Teleportal.java | 3 +- Mage.Sets/src/mage/cards/t/TemurCharm.java | 3 +- .../src/mage/cards/t/TemurWarShaman.java | 3 +- .../src/mage/cards/t/TendershootDryad.java | 3 +- .../mage/cards/t/TerritorialHammerskull.java | 3 +- .../src/mage/cards/t/TerrorOfKruinPass.java | 3 +- .../src/mage/cards/t/TetzimocPrimalDeath.java | 3 +- .../src/mage/cards/t/TeysaOrzhovScion.java | 3 +- .../src/mage/cards/t/TheTriumphOfAnax.java | 3 +- Mage.Sets/src/mage/cards/t/ThopterArrest.java | 3 +- Mage.Sets/src/mage/cards/t/ThornMammoth.java | 3 +- Mage.Sets/src/mage/cards/t/Thoughtleech.java | 3 +- Mage.Sets/src/mage/cards/t/ThrashThreat.java | 3 +- .../src/mage/cards/t/ThundercloudShaman.java | 3 +- .../src/mage/cards/t/ThundermawHellkite.java | 3 +- .../src/mage/cards/t/TidebinderMage.java | 3 +- .../src/mage/cards/t/TimbermawLarva.java | 3 +- .../src/mage/cards/t/TimberpackWolf.java | 3 +- Mage.Sets/src/mage/cards/t/TimeOfHeroes.java | 3 +- Mage.Sets/src/mage/cards/t/TimeToFeed.java | 3 +- .../cards/t/TitaniaProtectorOfArgoth.java | 3 +- Mage.Sets/src/mage/cards/t/TitanicBrawl.java | 3 +- Mage.Sets/src/mage/cards/t/ToilToRenown.java | 3 +- .../src/mage/cards/t/TolsimirWolfblood.java | 5 +- .../src/mage/cards/t/ToothCollector.java | 3 +- Mage.Sets/src/mage/cards/t/Topplegeist.java | 3 +- .../src/mage/cards/t/ToshiroUmezawa.java | 3 +- Mage.Sets/src/mage/cards/t/Touchstone.java | 3 +- Mage.Sets/src/mage/cards/t/TourachsGate.java | 3 +- Mage.Sets/src/mage/cards/t/TrapjawTyrant.java | 3 +- .../src/mage/cards/t/TraverseTheOutlands.java | 3 +- Mage.Sets/src/mage/cards/t/TriangleOfWar.java | 3 +- .../src/mage/cards/t/TuskguardCaptain.java | 3 +- .../src/mage/cards/t/TuvasaTheSunlit.java | 3 +- .../src/mage/cards/t/TwistedJustice.java | 3 +- .../src/mage/cards/u/UbulSarGatekeepers.java | 3 +- .../mage/cards/u/UlrichUncontestedAlpha.java | 3 +- .../src/mage/cards/u/UlvenwaldMysteries.java | 3 +- .../src/mage/cards/u/UlvenwaldObserver.java | 3 +- Mage.Sets/src/mage/cards/u/UndeadAugur.java | 3 +- .../src/mage/cards/u/UndercityUprising.java | 3 +- .../src/mage/cards/u/UnnaturalAggression.java | 3 +- .../src/mage/cards/u/UnnervingAssault.java | 5 +- Mage.Sets/src/mage/cards/u/UnrulyMob.java | 3 +- .../src/mage/cards/u/UnstoppableAsh.java | 3 +- Mage.Sets/src/mage/cards/u/UrborgStalker.java | 3 +- Mage.Sets/src/mage/cards/u/UrgeToFeed.java | 3 +- .../mage/cards/u/UrzaAcademyHeadmaster.java | 3 +- .../cards/v/ValakutTheMoltenPinnacle.java | 3 +- Mage.Sets/src/mage/cards/v/VampiricFury.java | 3 +- Mage.Sets/src/mage/cards/v/Vandalblast.java | 3 +- .../src/mage/cards/v/VanquishersBanner.java | 3 +- .../cards/v/VarchildBetrayerOfKjeldor.java | 3 +- Mage.Sets/src/mage/cards/v/VastwoodHydra.java | 3 +- .../src/mage/cards/v/VedalkenPlotter.java | 3 +- .../src/mage/cards/v/VelaTheNightClad.java | 3 +- .../src/mage/cards/v/VerdurousGearhulk.java | 3 +- Mage.Sets/src/mage/cards/v/VexingBeetle.java | 3 +- Mage.Sets/src/mage/cards/v/ViashinoBey.java | 5 +- .../src/mage/cards/v/VineshaperMystic.java | 3 +- .../src/mage/cards/v/ViridianLorebearers.java | 3 +- Mage.Sets/src/mage/cards/v/VitalSplicer.java | 3 +- .../src/mage/cards/v/VivienOfTheArkbow.java | 3 +- .../src/mage/cards/v/VizierOfTheTrue.java | 3 +- .../src/mage/cards/v/VolcanicOffering.java | 5 +- .../src/mage/cards/v/VolcanicVision.java | 3 +- .../src/mage/cards/v/VoraciousHydra.java | 3 +- .../src/mage/cards/v/VraskasFinisher.java | 3 +- .../src/mage/cards/w/WalkerOfTheWastes.java | 3 +- Mage.Sets/src/mage/cards/w/WarsToll.java | 5 +- Mage.Sets/src/mage/cards/w/WarteyeWitch.java | 3 +- Mage.Sets/src/mage/cards/w/WashOut.java | 3 +- .../src/mage/cards/w/WatertrapWeaver.java | 3 +- .../src/mage/cards/w/WavecrashTriton.java | 3 +- Mage.Sets/src/mage/cards/w/WaxingMoon.java | 3 +- .../src/mage/cards/w/WaywardDisciple.java | 3 +- Mage.Sets/src/mage/cards/w/WeaponSurge.java | 3 +- .../src/mage/cards/w/WeaverOfLightning.java | 3 +- Mage.Sets/src/mage/cards/w/WickedWolf.java | 3 +- Mage.Sets/src/mage/cards/w/WildInstincts.java | 3 +- .../src/mage/cards/w/WildernessElemental.java | 3 +- .../src/mage/cards/w/WildfireCerberus.java | 3 +- Mage.Sets/src/mage/cards/w/WiltLeafLiege.java | 5 +- .../src/mage/cards/w/WindsOfAbandon.java | 3 +- .../src/mage/cards/w/WindsOfQalSisma.java | 3 +- Mage.Sets/src/mage/cards/w/WitchHunter.java | 3 +- .../src/mage/cards/w/WitheringWisps.java | 3 +- .../src/mage/cards/w/WoollyMammoths.java | 3 +- .../src/mage/cards/w/WorldgorgerDragon.java | 3 +- .../src/mage/cards/w/WrensRunPackmaster.java | 3 +- .../src/mage/cards/x/XathridNecromancer.java | 3 +- .../src/mage/cards/y/YasovaDragonclaw.java | 3 +- .../mage/cards/y/YurikoTheTigersShadow.java | 3 +- .../src/mage/cards/z/ZulaportCutthroat.java | 3 - .../effects/common/PopulateEffect.java | 3 +- .../common/SacrificeOpponentsEffect.java | 3 +- .../SacrificeOpponentsUnlessPayEffect.java | 3 +- .../mage/abilities/keyword/BountyAbility.java | 3 +- .../abilities/keyword/SoulbondAbility.java | 3 +- .../mana/AnyColorLandsProduceManaAbility.java | 2 +- .../AnyColorPermanentTypesManaAbility.java | 3 +- .../java/mage/constants/TargetController.java | 2 +- .../main/java/mage/filter/StaticFilters.java | 15 ++--- .../FilterControlledCreatureInPlay.java | 3 +- .../common/FilterControlledPermanent.java | 3 +- .../FilterOpponentsCreaturePermanent.java | 5 +- .../common/FilterTeamCreaturePermanent.java | 5 +- .../filter/common/FilterTeamPermanent.java | 5 +- .../permanent/ControllerPredicate.java | 67 ------------------- .../emblems/KothOfTheHammerEmblem.java | 3 +- .../emblems/TeferiHeroOfDominariaEmblem.java | 3 +- .../permanent/token/DoomedArtisanToken.java | 3 +- .../permanent/token/SpyMasterGoblinToken.java | 3 +- 783 files changed, 829 insertions(+), 1689 deletions(-) delete mode 100644 Mage/src/main/java/mage/filter/predicate/permanent/ControllerPredicate.java diff --git a/Mage.Sets/src/mage/cards/a/AbzanAscendancy.java b/Mage.Sets/src/mage/cards/a/AbzanAscendancy.java index 0d84ef3c1e2..594e077713c 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanAscendancy.java +++ b/Mage.Sets/src/mage/cards/a/AbzanAscendancy.java @@ -14,7 +14,6 @@ import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.SpiritWhiteToken; @@ -27,7 +26,7 @@ public final class AbzanAscendancy extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.not(TokenPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java b/Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java index 1e89dd06270..1a7657a6df8 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java +++ b/Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; import java.util.UUID; @@ -26,7 +25,7 @@ public final class AbzanBattlePriest extends CardImpl { static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(new CounterPredicate(CounterType.P1P1)); } diff --git a/Mage.Sets/src/mage/cards/a/AbzanFalconer.java b/Mage.Sets/src/mage/cards/a/AbzanFalconer.java index 40fb3f1a2a4..53980309ed1 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanFalconer.java +++ b/Mage.Sets/src/mage/cards/a/AbzanFalconer.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; /** @@ -25,7 +24,7 @@ public final class AbzanFalconer extends CardImpl { private static final FilterPermanent filter = new FilterPermanent(); static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(new CounterPredicate(CounterType.P1P1)); } diff --git a/Mage.Sets/src/mage/cards/a/ActOfAggression.java b/Mage.Sets/src/mage/cards/a/ActOfAggression.java index a061fc7adfd..5f77b70d443 100644 --- a/Mage.Sets/src/mage/cards/a/ActOfAggression.java +++ b/Mage.Sets/src/mage/cards/a/ActOfAggression.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class ActOfAggression extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ActOfAggression(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java b/Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java index 7c23ced8ebe..9ec9619d188 100644 --- a/Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java +++ b/Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @author nantuko @@ -23,7 +22,7 @@ public final class AdaptiveAutomaton extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control of the chosen type"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public AdaptiveAutomaton(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AdelizTheCinderWind.java b/Mage.Sets/src/mage/cards/a/AdelizTheCinderWind.java index 568e4aaabe0..0ce9933ff87 100644 --- a/Mage.Sets/src/mage/cards/a/AdelizTheCinderWind.java +++ b/Mage.Sets/src/mage/cards/a/AdelizTheCinderWind.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -24,7 +23,7 @@ public final class AdelizTheCinderWind extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Wizards"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.WIZARD.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java b/Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java index 19aed1c9ef9..3c5493b4628 100644 --- a/Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java +++ b/Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java @@ -14,7 +14,6 @@ import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.Predicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; @@ -33,7 +32,7 @@ public final class AdmiralBeckettBrass extends CardImpl { static { filter.add(SubType.PIRATE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter2.add(new ControllerDealtDamageByPiratesPredicate()); } diff --git a/Mage.Sets/src/mage/cards/a/AdvocateOfTheBeast.java b/Mage.Sets/src/mage/cards/a/AdvocateOfTheBeast.java index 3297c71efa9..23399c33657 100644 --- a/Mage.Sets/src/mage/cards/a/AdvocateOfTheBeast.java +++ b/Mage.Sets/src/mage/cards/a/AdvocateOfTheBeast.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; @@ -25,7 +24,7 @@ public final class AdvocateOfTheBeast extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Beast creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.BEAST.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/a/AetherTradewinds.java b/Mage.Sets/src/mage/cards/a/AetherTradewinds.java index c11cd2a87dc..d4c95d989b6 100644 --- a/Mage.Sets/src/mage/cards/a/AetherTradewinds.java +++ b/Mage.Sets/src/mage/cards/a/AetherTradewinds.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; @@ -22,7 +21,7 @@ public final class AetherTradewinds extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("permanent you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public AetherTradewinds(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AffectionateIndrik.java b/Mage.Sets/src/mage/cards/a/AffectionateIndrik.java index da4b64f4049..332ab789f2d 100644 --- a/Mage.Sets/src/mage/cards/a/AffectionateIndrik.java +++ b/Mage.Sets/src/mage/cards/a/AffectionateIndrik.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class AffectionateIndrik extends CardImpl { = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public AffectionateIndrik(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AggressiveInstinct.java b/Mage.Sets/src/mage/cards/a/AggressiveInstinct.java index 243294d59c9..7bc7d8fe4d9 100644 --- a/Mage.Sets/src/mage/cards/a/AggressiveInstinct.java +++ b/Mage.Sets/src/mage/cards/a/AggressiveInstinct.java @@ -7,7 +7,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -20,7 +19,7 @@ public final class AggressiveInstinct extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public AggressiveInstinct(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AinokBondKin.java b/Mage.Sets/src/mage/cards/a/AinokBondKin.java index 39000ec5c5c..ccec3c06fcf 100644 --- a/Mage.Sets/src/mage/cards/a/AinokBondKin.java +++ b/Mage.Sets/src/mage/cards/a/AinokBondKin.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; /** @@ -26,7 +25,7 @@ public final class AinokBondKin extends CardImpl { static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(new CounterPredicate(CounterType.P1P1)); } diff --git a/Mage.Sets/src/mage/cards/a/AinokSurvivalist.java b/Mage.Sets/src/mage/cards/a/AinokSurvivalist.java index 598ccf65c61..0a406fc3434 100644 --- a/Mage.Sets/src/mage/cards/a/AinokSurvivalist.java +++ b/Mage.Sets/src/mage/cards/a/AinokSurvivalist.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; /** @@ -27,7 +26,7 @@ public final class AinokSurvivalist extends CardImpl { private static final FilterArtifactOrEnchantmentPermanent filter = new FilterArtifactOrEnchantmentPermanent("artifact or enchantment an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public AinokSurvivalist(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java b/Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java index 136612aaa99..9ca631a09eb 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java +++ b/Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java @@ -19,7 +19,6 @@ import mage.counters.CounterType; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanentAmount; /** @@ -32,7 +31,7 @@ public final class AjaniMentorOfHeroes extends CardImpl { private static final FilterCard filterCard = new FilterCard("an Aura, creature, or planeswalker card"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filterCard.add(Predicates.or( SubType.AURA.getPredicate(), CardType.CREATURE.getPredicate(), diff --git a/Mage.Sets/src/mage/cards/a/AjaniSteadfast.java b/Mage.Sets/src/mage/cards/a/AjaniSteadfast.java index 1d4a95c8911..a7781d57448 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniSteadfast.java +++ b/Mage.Sets/src/mage/cards/a/AjaniSteadfast.java @@ -23,7 +23,6 @@ import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterPlaneswalkerPermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.command.emblems.AjaniSteadfastEmblem; import mage.target.common.TargetCreaturePermanent; @@ -37,7 +36,7 @@ public final class AjaniSteadfast extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public AjaniSteadfast(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AjaniStrengthOfThePride.java b/Mage.Sets/src/mage/cards/a/AjaniStrengthOfThePride.java index 15fd24f5f6a..c3b9095d31d 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniStrengthOfThePride.java +++ b/Mage.Sets/src/mage/cards/a/AjaniStrengthOfThePride.java @@ -16,7 +16,6 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.token.AjanisPridemateToken; import mage.players.Player; @@ -88,7 +87,7 @@ class AjaniStrengthOfThePrideEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterPermanent(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filter.add(Predicates.or( CardType.ARTIFACT.getPredicate(), CardType.CREATURE.getPredicate() diff --git a/Mage.Sets/src/mage/cards/a/AjaniUnyielding.java b/Mage.Sets/src/mage/cards/a/AjaniUnyielding.java index 8e27ead78d1..8f054d7537d 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniUnyielding.java +++ b/Mage.Sets/src/mage/cards/a/AjaniUnyielding.java @@ -20,7 +20,6 @@ import mage.filter.common.FilterPermanentCard; import mage.filter.common.FilterPlaneswalkerPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -33,7 +32,7 @@ public final class AjaniUnyielding extends CardImpl { static { nonlandPermanentFilter.add(Predicates.not(CardType.LAND.getPredicate())); - planeswalkerFilter.add(new ControllerPredicate(TargetController.YOU)); + planeswalkerFilter.add(TargetController.YOU.getControllerPredicate()); planeswalkerFilter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/a/AkoumBattlesinger.java b/Mage.Sets/src/mage/cards/a/AkoumBattlesinger.java index 4a591933918..f4713313395 100644 --- a/Mage.Sets/src/mage/cards/a/AkoumBattlesinger.java +++ b/Mage.Sets/src/mage/cards/a/AkoumBattlesinger.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class AkoumBattlesinger extends CardImpl { static { filter.add(SubType.ALLY.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public AkoumBattlesinger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AkroanHoplite.java b/Mage.Sets/src/mage/cards/a/AkroanHoplite.java index 3a9d6a906e4..d8476703ba5 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanHoplite.java +++ b/Mage.Sets/src/mage/cards/a/AkroanHoplite.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AttackingPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -26,7 +25,7 @@ public final class AkroanHoplite extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("attacking creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AttackingPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/a/AkronLegionnaire.java b/Mage.Sets/src/mage/cards/a/AkronLegionnaire.java index a9311332ed3..1219c6b44b9 100644 --- a/Mage.Sets/src/mage/cards/a/AkronLegionnaire.java +++ b/Mage.Sets/src/mage/cards/a/AkronLegionnaire.java @@ -12,7 +12,6 @@ import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -23,7 +22,7 @@ public final class AkronLegionnaire extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.not(new NamePredicate("Akron Legionnaire"))); filter.add(Predicates.not(CardType.ARTIFACT.getPredicate())); } diff --git a/Mage.Sets/src/mage/cards/a/AkuDjinn.java b/Mage.Sets/src/mage/cards/a/AkuDjinn.java index 3f191a359b7..8123f25d44c 100644 --- a/Mage.Sets/src/mage/cards/a/AkuDjinn.java +++ b/Mage.Sets/src/mage/cards/a/AkuDjinn.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -24,7 +23,7 @@ public final class AkuDjinn extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature each opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public AkuDjinn(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AlelaArtfulProvocateur.java b/Mage.Sets/src/mage/cards/a/AlelaArtfulProvocateur.java index b583f263929..222b3451684 100644 --- a/Mage.Sets/src/mage/cards/a/AlelaArtfulProvocateur.java +++ b/Mage.Sets/src/mage/cards/a/AlelaArtfulProvocateur.java @@ -15,7 +15,6 @@ import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.FaerieToken; import java.util.UUID; @@ -31,7 +30,7 @@ public final class AlelaArtfulProvocateur extends CardImpl { static { filter.add(new AbilityPredicate(FlyingAbility.class)); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter2.add(Predicates.or( CardType.ARTIFACT.getPredicate(), CardType.ENCHANTMENT.getPredicate() diff --git a/Mage.Sets/src/mage/cards/a/AllThatGlitters.java b/Mage.Sets/src/mage/cards/a/AllThatGlitters.java index 830f1f8e00e..5ab3bc2e889 100644 --- a/Mage.Sets/src/mage/cards/a/AllThatGlitters.java +++ b/Mage.Sets/src/mage/cards/a/AllThatGlitters.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -26,7 +25,7 @@ public final class AllThatGlitters extends CardImpl { private static final FilterPermanent filter = new FilterArtifactOrEnchantmentPermanent(); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } private static final DynamicValue xValue = new PermanentsOnBattlefieldCount(filter); diff --git a/Mage.Sets/src/mage/cards/a/AlluringSiren.java b/Mage.Sets/src/mage/cards/a/AlluringSiren.java index 234cacc7762..ab941ff0603 100644 --- a/Mage.Sets/src/mage/cards/a/AlluringSiren.java +++ b/Mage.Sets/src/mage/cards/a/AlluringSiren.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class AlluringSiren extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public AlluringSiren(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AlphaBrawl.java b/Mage.Sets/src/mage/cards/a/AlphaBrawl.java index 2c580b520a8..758f0a75f82 100644 --- a/Mage.Sets/src/mage/cards/a/AlphaBrawl.java +++ b/Mage.Sets/src/mage/cards/a/AlphaBrawl.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -25,7 +24,7 @@ public final class AlphaBrawl extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public AlphaBrawl(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AlpineMoon.java b/Mage.Sets/src/mage/cards/a/AlpineMoon.java index 779769536a9..7ac445e5e5b 100644 --- a/Mage.Sets/src/mage/cards/a/AlpineMoon.java +++ b/Mage.Sets/src/mage/cards/a/AlpineMoon.java @@ -13,7 +13,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -49,7 +48,7 @@ class AlpineMoonEffect extends ContinuousEffectImpl { private static final FilterPermanent filter = new FilterLandPermanent(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filter.add(Predicates.not(SuperType.BASIC.getPredicate())); } diff --git a/Mage.Sets/src/mage/cards/a/AltacBloodseeker.java b/Mage.Sets/src/mage/cards/a/AltacBloodseeker.java index b9d6032bfa6..c2e04c756b3 100644 --- a/Mage.Sets/src/mage/cards/a/AltacBloodseeker.java +++ b/Mage.Sets/src/mage/cards/a/AltacBloodseeker.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -28,7 +27,7 @@ public final class AltacBloodseeker extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public AltacBloodseeker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/Ambuscade.java b/Mage.Sets/src/mage/cards/a/Ambuscade.java index 020a3523daf..bfeedd4abc1 100644 --- a/Mage.Sets/src/mage/cards/a/Ambuscade.java +++ b/Mage.Sets/src/mage/cards/a/Ambuscade.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -24,7 +23,7 @@ public final class Ambuscade extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public Ambuscade(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AmuletOfSafekeeping.java b/Mage.Sets/src/mage/cards/a/AmuletOfSafekeeping.java index fd9e1c7a399..cc47fee9031 100644 --- a/Mage.Sets/src/mage/cards/a/AmuletOfSafekeeping.java +++ b/Mage.Sets/src/mage/cards/a/AmuletOfSafekeeping.java @@ -15,7 +15,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterStackObject; import mage.filter.StaticFilters; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.StackObject; @@ -58,7 +57,7 @@ class AmuletOfSafekeepingTriggeredAbility extends TriggeredAbilityImpl { private static final FilterStackObject filter = new FilterStackObject(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public AmuletOfSafekeepingTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/a/AngelOfDeliverance.java b/Mage.Sets/src/mage/cards/a/AngelOfDeliverance.java index ba03f1345ac..d238392b9b0 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfDeliverance.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfDeliverance.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -32,7 +31,7 @@ public final class AngelOfDeliverance extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public AngelOfDeliverance(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AngelOfSanctions.java b/Mage.Sets/src/mage/cards/a/AngelOfSanctions.java index c6ebd9d003d..3c09c2e9398 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfSanctions.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfSanctions.java @@ -17,7 +17,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; /** @@ -29,7 +28,7 @@ public final class AngelOfSanctions extends CardImpl { private static final FilterNonlandPermanent filter = new FilterNonlandPermanent(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public AngelOfSanctions(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AngelicVoices.java b/Mage.Sets/src/mage/cards/a/AngelicVoices.java index 5134a1b842e..182929102d8 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicVoices.java +++ b/Mage.Sets/src/mage/cards/a/AngelicVoices.java @@ -16,7 +16,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -34,7 +33,7 @@ public final class AngelicVoices extends CardImpl { new ColorPredicate(ObjectColor.WHITE) ) )); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } private static final Condition condition = new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter)); diff --git a/Mage.Sets/src/mage/cards/a/AnglerTurtle.java b/Mage.Sets/src/mage/cards/a/AnglerTurtle.java index 8cf204783e9..4eda255e366 100644 --- a/Mage.Sets/src/mage/cards/a/AnglerTurtle.java +++ b/Mage.Sets/src/mage/cards/a/AnglerTurtle.java @@ -8,7 +8,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.watchers.common.AttackedThisTurnWatcher; import java.util.UUID; @@ -21,7 +20,7 @@ public final class AnglerTurtle extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public AnglerTurtle(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AngryMob.java b/Mage.Sets/src/mage/cards/a/AngryMob.java index 153e45f90fb..5838a538aeb 100644 --- a/Mage.Sets/src/mage/cards/a/AngryMob.java +++ b/Mage.Sets/src/mage/cards/a/AngryMob.java @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class AngryMob extends CardImpl { static { filter.add(SubType.SWAMP.getPredicate()); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public AngryMob(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ApexAltisaur.java b/Mage.Sets/src/mage/cards/a/ApexAltisaur.java index 2f14ea0057b..b97a614a8d9 100644 --- a/Mage.Sets/src/mage/cards/a/ApexAltisaur.java +++ b/Mage.Sets/src/mage/cards/a/ApexAltisaur.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import java.util.UUID; @@ -26,7 +25,7 @@ public final class ApexAltisaur extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public ApexAltisaur(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AppealAuthority.java b/Mage.Sets/src/mage/cards/a/AppealAuthority.java index 3fd64be5f69..55c69c8fb1b 100644 --- a/Mage.Sets/src/mage/cards/a/AppealAuthority.java +++ b/Mage.Sets/src/mage/cards/a/AppealAuthority.java @@ -17,7 +17,6 @@ import mage.constants.SpellAbilityType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -45,7 +44,7 @@ public final class AppealAuthority extends SplitCard { // Tap up to two target creatures your opponents control. Creatures you control gain vigilance until end of turn. getRightHalfCard().getSpellAbility().addEffect(new TapTargetEffect()); FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control"); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); getRightHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent(0, 2, filter, false)); getRightHalfCard().getSpellAbility().addEffect(new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent("creatures"))); diff --git a/Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java b/Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java index 7c5b46c6af2..1c7f8f0ae16 100644 --- a/Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java +++ b/Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java @@ -20,7 +20,6 @@ import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -39,10 +38,10 @@ public final class ArahboRoarOfTheWorld extends CardImpl { static { filter.add(SubType.CAT.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); filter2.add(SubType.CAT.getPredicate()); - filter2.add(new ControllerPredicate(TargetController.YOU)); + filter2.add(TargetController.YOU.getControllerPredicate()); filter2.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/a/ArborColossus.java b/Mage.Sets/src/mage/cards/a/ArborColossus.java index 61e77ad997b..824e327f0d4 100644 --- a/Mage.Sets/src/mage/cards/a/ArborColossus.java +++ b/Mage.Sets/src/mage/cards/a/ArborColossus.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; @@ -29,7 +28,7 @@ public final class ArborColossus extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with flying an opponent controls"); static { filter.add(new AbilityPredicate(FlyingAbility.class)); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ArborColossus(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java b/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java index 2737870ceed..ecd2df89767 100644 --- a/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java +++ b/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java @@ -17,7 +17,6 @@ import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.AttackingPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; /** @@ -28,7 +27,7 @@ public final class ArcadesSabboth extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped nonattacking creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); filter.add(Predicates.not(AttackingPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/a/ArcaneLighthouse.java b/Mage.Sets/src/mage/cards/a/ArcaneLighthouse.java index d1326f85170..a7f18ea04cd 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneLighthouse.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneLighthouse.java @@ -18,7 +18,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -30,7 +29,7 @@ public final class ArcaneLighthouse extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ArcaneLighthouse(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ArchangelAvacyn.java b/Mage.Sets/src/mage/cards/a/ArchangelAvacyn.java index 97b3609328a..8f740c73b3a 100644 --- a/Mage.Sets/src/mage/cards/a/ArchangelAvacyn.java +++ b/Mage.Sets/src/mage/cards/a/ArchangelAvacyn.java @@ -19,7 +19,6 @@ import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; @@ -34,7 +33,7 @@ public final class ArchangelAvacyn extends CardImpl { static { filter.add(Predicates.not(SubType.ANGEL.getPredicate())); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public ArchangelAvacyn(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ArchdemonOfGreed.java b/Mage.Sets/src/mage/cards/a/ArchdemonOfGreed.java index 6576c2bcd4d..a770510fb3a 100644 --- a/Mage.Sets/src/mage/cards/a/ArchdemonOfGreed.java +++ b/Mage.Sets/src/mage/cards/a/ArchdemonOfGreed.java @@ -15,7 +15,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -32,7 +31,7 @@ public final class ArchdemonOfGreed extends CardImpl { static { filter.add(SubType.HUMAN.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public ArchdemonOfGreed(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ArchetypeOfAggression.java b/Mage.Sets/src/mage/cards/a/ArchetypeOfAggression.java index 680837da277..787f9f1d5d8 100644 --- a/Mage.Sets/src/mage/cards/a/ArchetypeOfAggression.java +++ b/Mage.Sets/src/mage/cards/a/ArchetypeOfAggression.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -23,7 +22,7 @@ public final class ArchetypeOfAggression extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ArchetypeOfAggression(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ArchetypeOfCourage.java b/Mage.Sets/src/mage/cards/a/ArchetypeOfCourage.java index 5eb12f56eac..2eca14f0151 100644 --- a/Mage.Sets/src/mage/cards/a/ArchetypeOfCourage.java +++ b/Mage.Sets/src/mage/cards/a/ArchetypeOfCourage.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -22,7 +21,7 @@ public final class ArchetypeOfCourage extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ArchetypeOfCourage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ArchetypeOfEndurance.java b/Mage.Sets/src/mage/cards/a/ArchetypeOfEndurance.java index 596552de09b..4bc9923ee9a 100644 --- a/Mage.Sets/src/mage/cards/a/ArchetypeOfEndurance.java +++ b/Mage.Sets/src/mage/cards/a/ArchetypeOfEndurance.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -23,7 +22,7 @@ public final class ArchetypeOfEndurance extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ArchetypeOfEndurance(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ArchetypeOfFinality.java b/Mage.Sets/src/mage/cards/a/ArchetypeOfFinality.java index dbb1a2d0ec4..b78980c5b3b 100644 --- a/Mage.Sets/src/mage/cards/a/ArchetypeOfFinality.java +++ b/Mage.Sets/src/mage/cards/a/ArchetypeOfFinality.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -23,7 +22,7 @@ public final class ArchetypeOfFinality extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ArchetypeOfFinality(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ArchetypeOfImagination.java b/Mage.Sets/src/mage/cards/a/ArchetypeOfImagination.java index 587fea8dc6b..505d9118c64 100644 --- a/Mage.Sets/src/mage/cards/a/ArchetypeOfImagination.java +++ b/Mage.Sets/src/mage/cards/a/ArchetypeOfImagination.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -22,7 +21,7 @@ public final class ArchetypeOfImagination extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ArchetypeOfImagination(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ArchonOfTheTriumvirate.java b/Mage.Sets/src/mage/cards/a/ArchonOfTheTriumvirate.java index 5b417cb8445..d438175ea52 100644 --- a/Mage.Sets/src/mage/cards/a/ArchonOfTheTriumvirate.java +++ b/Mage.Sets/src/mage/cards/a/ArchonOfTheTriumvirate.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetNonlandPermanent; /** @@ -25,7 +24,7 @@ public final class ArchonOfTheTriumvirate extends CardImpl { private static final FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanents your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ArchonOfTheTriumvirate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ArenaAthlete.java b/Mage.Sets/src/mage/cards/a/ArenaAthlete.java index 83e5acda34d..69262026c63 100644 --- a/Mage.Sets/src/mage/cards/a/ArenaAthlete.java +++ b/Mage.Sets/src/mage/cards/a/ArenaAthlete.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -25,7 +24,7 @@ public final class ArenaAthlete extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ArenaAthlete(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ArmamentCorps.java b/Mage.Sets/src/mage/cards/a/ArmamentCorps.java index dd8ea812eb8..3cf408a2e7e 100644 --- a/Mage.Sets/src/mage/cards/a/ArmamentCorps.java +++ b/Mage.Sets/src/mage/cards/a/ArmamentCorps.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanentAmount; /** @@ -25,7 +24,7 @@ public final class ArmamentCorps extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public ArmamentCorps(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ArmoredAscension.java b/Mage.Sets/src/mage/cards/a/ArmoredAscension.java index baccfb13c9c..ad9a117331d 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredAscension.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredAscension.java @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -27,7 +26,7 @@ public final class ArmoredAscension extends CardImpl { static { filter.add(SubType.PLAINS.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public ArmoredAscension(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AssassinsTrophy.java b/Mage.Sets/src/mage/cards/a/AssassinsTrophy.java index a973855cc4e..829c6253fa9 100644 --- a/Mage.Sets/src/mage/cards/a/AssassinsTrophy.java +++ b/Mage.Sets/src/mage/cards/a/AssassinsTrophy.java @@ -14,7 +14,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -29,7 +28,7 @@ public final class AssassinsTrophy extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("permanent an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public AssassinsTrophy(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AtarkaPummeler.java b/Mage.Sets/src/mage/cards/a/AtarkaPummeler.java index de697873b46..bc46f7c4d1a 100644 --- a/Mage.Sets/src/mage/cards/a/AtarkaPummeler.java +++ b/Mage.Sets/src/mage/cards/a/AtarkaPummeler.java @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -24,7 +23,7 @@ public final class AtarkaPummeler extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public AtarkaPummeler(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/Atogatog.java b/Mage.Sets/src/mage/cards/a/Atogatog.java index db546c4644d..3e10dcf1c36 100644 --- a/Mage.Sets/src/mage/cards/a/Atogatog.java +++ b/Mage.Sets/src/mage/cards/a/Atogatog.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class Atogatog extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("an Atog creature"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.ATOG.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/a/AttendantOfVraska.java b/Mage.Sets/src/mage/cards/a/AttendantOfVraska.java index 96765554d0a..ca986d1948c 100644 --- a/Mage.Sets/src/mage/cards/a/AttendantOfVraska.java +++ b/Mage.Sets/src/mage/cards/a/AttendantOfVraska.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -24,7 +23,7 @@ public final class AttendantOfVraska extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("a Vraska planeswalker"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(CardType.PLANESWALKER.getPredicate()); filter.add(SubType.VRASKA.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/a/AuntiesSnitch.java b/Mage.Sets/src/mage/cards/a/AuntiesSnitch.java index 360a7d5c74e..9c0b5f136a7 100644 --- a/Mage.Sets/src/mage/cards/a/AuntiesSnitch.java +++ b/Mage.Sets/src/mage/cards/a/AuntiesSnitch.java @@ -15,7 +15,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; @@ -58,7 +57,7 @@ class AuntiesSnitchTriggeredAbility extends TriggeredAbilityImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Goblin or Rogue you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.or(SubType.GOBLIN.getPredicate(), SubType.ROGUE.getPredicate())); } diff --git a/Mage.Sets/src/mage/cards/a/AuraFinesse.java b/Mage.Sets/src/mage/cards/a/AuraFinesse.java index 0066eea9f18..a873394143b 100644 --- a/Mage.Sets/src/mage/cards/a/AuraFinesse.java +++ b/Mage.Sets/src/mage/cards/a/AuraFinesse.java @@ -12,7 +12,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterEnchantmentPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -29,7 +28,7 @@ public final class AuraFinesse extends CardImpl { private static final FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent("Aura you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.AURA.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/a/AuthorityOfTheConsuls.java b/Mage.Sets/src/mage/cards/a/AuthorityOfTheConsuls.java index b269fc86595..fc560830721 100644 --- a/Mage.Sets/src/mage/cards/a/AuthorityOfTheConsuls.java +++ b/Mage.Sets/src/mage/cards/a/AuthorityOfTheConsuls.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.EntersTheBattlefieldEvent; import mage.game.events.GameEvent; @@ -26,7 +25,7 @@ public final class AuthorityOfTheConsuls extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public AuthorityOfTheConsuls(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AysenCrusader.java b/Mage.Sets/src/mage/cards/a/AysenCrusader.java index 1fb31ebecfa..fe47c889226 100644 --- a/Mage.Sets/src/mage/cards/a/AysenCrusader.java +++ b/Mage.Sets/src/mage/cards/a/AysenCrusader.java @@ -17,7 +17,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -32,7 +31,7 @@ public final class AysenCrusader extends CardImpl { SubType.SOLDIER.getPredicate(), SubType.WARRIOR.getPredicate() )); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public AysenCrusader(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AyulaQueenAmongBears.java b/Mage.Sets/src/mage/cards/a/AyulaQueenAmongBears.java index 3d209a7f03b..bff48fbe4a3 100644 --- a/Mage.Sets/src/mage/cards/a/AyulaQueenAmongBears.java +++ b/Mage.Sets/src/mage/cards/a/AyulaQueenAmongBears.java @@ -17,7 +17,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; @@ -36,7 +35,7 @@ public final class AyulaQueenAmongBears extends CardImpl { static { filter.add(AnotherPredicate.instance); filter3.add(SubType.BEAR.getPredicate()); - filter4.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter4.add(TargetController.NOT_YOU.getControllerPredicate()); } public AyulaQueenAmongBears(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AzoriusArrester.java b/Mage.Sets/src/mage/cards/a/AzoriusArrester.java index 62f585d334d..d02e328392e 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusArrester.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusArrester.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class AzoriusArrester extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public AzoriusArrester(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AzoriusJusticiar.java b/Mage.Sets/src/mage/cards/a/AzoriusJusticiar.java index 468630d2ff8..64d8afaeaf7 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusJusticiar.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusJusticiar.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class AzoriusJusticiar extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public AzoriusJusticiar(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BafflingEnd.java b/Mage.Sets/src/mage/cards/b/BafflingEnd.java index 773296b9a11..28a9d808b1b 100644 --- a/Mage.Sets/src/mage/cards/b/BafflingEnd.java +++ b/Mage.Sets/src/mage/cards/b/BafflingEnd.java @@ -14,7 +14,6 @@ import mage.constants.ComparisonType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.DinosaurToken; import mage.target.Target; import mage.target.TargetPermanent; @@ -30,7 +29,7 @@ public final class BafflingEnd extends CardImpl { static { filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public BafflingEnd(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BanisherPriest.java b/Mage.Sets/src/mage/cards/b/BanisherPriest.java index 83b8c0fa0f3..f10f150e6a8 100644 --- a/Mage.Sets/src/mage/cards/b/BanisherPriest.java +++ b/Mage.Sets/src/mage/cards/b/BanisherPriest.java @@ -16,7 +16,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -31,7 +30,7 @@ public final class BanisherPriest extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public BanisherPriest(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BanishingLight.java b/Mage.Sets/src/mage/cards/b/BanishingLight.java index 5383a01ccc0..22c4b6c8a64 100644 --- a/Mage.Sets/src/mage/cards/b/BanishingLight.java +++ b/Mage.Sets/src/mage/cards/b/BanishingLight.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; /** @@ -24,7 +23,7 @@ public final class BanishingLight extends CardImpl { private static final FilterNonlandPermanent filter = new FilterNonlandPermanent(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public BanishingLight(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BarrageOfBoulders.java b/Mage.Sets/src/mage/cards/b/BarrageOfBoulders.java index df45e9b8d4d..e9b154a1c47 100644 --- a/Mage.Sets/src/mage/cards/b/BarrageOfBoulders.java +++ b/Mage.Sets/src/mage/cards/b/BarrageOfBoulders.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -27,7 +26,7 @@ public final class BarrageOfBoulders extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public BarrageOfBoulders(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java b/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java index 113aa308d98..d1982ec1f1f 100644 --- a/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java +++ b/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java @@ -19,7 +19,6 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.token.BaruFistOfKrosaToken; import mage.game.permanent.token.Token; @@ -35,7 +34,7 @@ public final class BaruFistOfKrosa extends CardImpl { static { forestFilter.add(SubType.FOREST.getPredicate()); - greenCreatureFilter.add(new ControllerPredicate(TargetController.YOU)); + greenCreatureFilter.add(TargetController.YOU.getControllerPredicate()); greenCreatureFilter.add(new ColorPredicate(ObjectColor.GREEN)); } diff --git a/Mage.Sets/src/mage/cards/b/BeastmastersMagemark.java b/Mage.Sets/src/mage/cards/b/BeastmastersMagemark.java index 418c6e671a2..5169d547c24 100644 --- a/Mage.Sets/src/mage/cards/b/BeastmastersMagemark.java +++ b/Mage.Sets/src/mage/cards/b/BeastmastersMagemark.java @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.EnchantedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -30,7 +29,7 @@ public final class BeastmastersMagemark extends CardImpl { static { filter.add(EnchantedPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public BeastmastersMagemark(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BelligerentSliver.java b/Mage.Sets/src/mage/cards/b/BelligerentSliver.java index 3eb9e52145e..aabb89735d4 100644 --- a/Mage.Sets/src/mage/cards/b/BelligerentSliver.java +++ b/Mage.Sets/src/mage/cards/b/BelligerentSliver.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -22,7 +21,7 @@ public final class BelligerentSliver extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Sliver creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.SLIVER.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/b/BellowingAegisaur.java b/Mage.Sets/src/mage/cards/b/BellowingAegisaur.java index b5e1084923a..8f7650e233e 100644 --- a/Mage.Sets/src/mage/cards/b/BellowingAegisaur.java +++ b/Mage.Sets/src/mage/cards/b/BellowingAegisaur.java @@ -14,7 +14,6 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class BellowingAegisaur extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/b/BenthicExplorers.java b/Mage.Sets/src/mage/cards/b/BenthicExplorers.java index 7fe85cffb6f..7361ea8b996 100644 --- a/Mage.Sets/src/mage/cards/b/BenthicExplorers.java +++ b/Mage.Sets/src/mage/cards/b/BenthicExplorers.java @@ -16,7 +16,6 @@ import mage.choices.Choice; import mage.choices.ChoiceColor; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -36,7 +35,7 @@ public final class BenthicExplorers extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("tapped land an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filter.add(TappedPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/b/Betrayal.java b/Mage.Sets/src/mage/cards/b/Betrayal.java index 89f60dd1d12..faf9e7cc01c 100644 --- a/Mage.Sets/src/mage/cards/b/Betrayal.java +++ b/Mage.Sets/src/mage/cards/b/Betrayal.java @@ -12,7 +12,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -26,7 +25,7 @@ public final class Betrayal extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public Betrayal(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BishopOfBinding.java b/Mage.Sets/src/mage/cards/b/BishopOfBinding.java index 9b1fccfe486..4bcebca4b0d 100644 --- a/Mage.Sets/src/mage/cards/b/BishopOfBinding.java +++ b/Mage.Sets/src/mage/cards/b/BishopOfBinding.java @@ -22,7 +22,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.ExileZone; import mage.game.Game; import mage.game.permanent.Permanent; @@ -38,7 +37,7 @@ public final class BishopOfBinding extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public BishopOfBinding(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BishopOfTheBloodstained.java b/Mage.Sets/src/mage/cards/b/BishopOfTheBloodstained.java index df91dd22942..7454450cfde 100644 --- a/Mage.Sets/src/mage/cards/b/BishopOfTheBloodstained.java +++ b/Mage.Sets/src/mage/cards/b/BishopOfTheBloodstained.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetOpponent; /** @@ -26,7 +25,7 @@ public final class BishopOfTheBloodstained extends CardImpl { static { filter.add(SubType.VAMPIRE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public BishopOfTheBloodstained(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BlackMarketDealer.java b/Mage.Sets/src/mage/cards/b/BlackMarketDealer.java index 1e79453e709..15029670660 100644 --- a/Mage.Sets/src/mage/cards/b/BlackMarketDealer.java +++ b/Mage.Sets/src/mage/cards/b/BlackMarketDealer.java @@ -17,7 +17,6 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPlayer; import mage.target.common.TargetOpponentsCreaturePermanent; @@ -32,7 +31,7 @@ public final class BlackMarketDealer extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a Rogue or Hunter creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.or(SubType.ROGUE.getPredicate(), SubType.HUNTER.getPredicate())); } diff --git a/Mage.Sets/src/mage/cards/b/BlessedReincarnation.java b/Mage.Sets/src/mage/cards/b/BlessedReincarnation.java index e36f72ab251..ac0276b9c5d 100644 --- a/Mage.Sets/src/mage/cards/b/BlessedReincarnation.java +++ b/Mage.Sets/src/mage/cards/b/BlessedReincarnation.java @@ -11,7 +11,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Library; @@ -27,7 +26,7 @@ public final class BlessedReincarnation extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public BlessedReincarnation(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BlindingSpray.java b/Mage.Sets/src/mage/cards/b/BlindingSpray.java index 655b2cfd869..98a644f6d07 100644 --- a/Mage.Sets/src/mage/cards/b/BlindingSpray.java +++ b/Mage.Sets/src/mage/cards/b/BlindingSpray.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -21,7 +20,7 @@ public final class BlindingSpray extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public BlindingSpray(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BloodChinRager.java b/Mage.Sets/src/mage/cards/b/BloodChinRager.java index d963122ee59..cfc8b8b0595 100644 --- a/Mage.Sets/src/mage/cards/b/BloodChinRager.java +++ b/Mage.Sets/src/mage/cards/b/BloodChinRager.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -24,7 +23,7 @@ public final class BloodChinRager extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(SubType.WARRIOR,"Warrior creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public BloodChinRager(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/Bloodbriar.java b/Mage.Sets/src/mage/cards/b/Bloodbriar.java index 6db0ffa8988..ac35c506f87 100644 --- a/Mage.Sets/src/mage/cards/b/Bloodbriar.java +++ b/Mage.Sets/src/mage/cards/b/Bloodbriar.java @@ -13,7 +13,6 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -24,7 +23,7 @@ public final class Bloodbriar extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("another permanent"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/b/BloodcrazedHoplite.java b/Mage.Sets/src/mage/cards/b/BloodcrazedHoplite.java index ed67c9676fb..6a528a475ae 100644 --- a/Mage.Sets/src/mage/cards/b/BloodcrazedHoplite.java +++ b/Mage.Sets/src/mage/cards/b/BloodcrazedHoplite.java @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -31,7 +30,7 @@ public final class BloodcrazedHoplite extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public BloodcrazedHoplite(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/Blustersquall.java b/Mage.Sets/src/mage/cards/b/Blustersquall.java index 797123adaac..07fec0ff2ca 100644 --- a/Mage.Sets/src/mage/cards/b/Blustersquall.java +++ b/Mage.Sets/src/mage/cards/b/Blustersquall.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -28,7 +27,7 @@ public final class Blustersquall extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public Blustersquall(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BoggartShenanigans.java b/Mage.Sets/src/mage/cards/b/BoggartShenanigans.java index 6ac2eca4c7e..5f9d0115826 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartShenanigans.java +++ b/Mage.Sets/src/mage/cards/b/BoggartShenanigans.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetPlayerOrPlaneswalker; /** @@ -23,7 +22,7 @@ public final class BoggartShenanigans extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another Goblin you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.GOBLIN.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/b/BoilingEarth.java b/Mage.Sets/src/mage/cards/b/BoilingEarth.java index bb72e70568b..7e045d04bf8 100644 --- a/Mage.Sets/src/mage/cards/b/BoilingEarth.java +++ b/Mage.Sets/src/mage/cards/b/BoilingEarth.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -20,7 +19,7 @@ public final class BoilingEarth extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public BoilingEarth(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BondsOfMortality.java b/Mage.Sets/src/mage/cards/b/BondsOfMortality.java index 692b9bf30b6..89ddf466407 100644 --- a/Mage.Sets/src/mage/cards/b/BondsOfMortality.java +++ b/Mage.Sets/src/mage/cards/b/BondsOfMortality.java @@ -18,7 +18,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -29,7 +28,7 @@ public final class BondsOfMortality extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public BondsOfMortality(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BoneyardScourge.java b/Mage.Sets/src/mage/cards/b/BoneyardScourge.java index 0b2b1121781..fa78b7ec433 100644 --- a/Mage.Sets/src/mage/cards/b/BoneyardScourge.java +++ b/Mage.Sets/src/mage/cards/b/BoneyardScourge.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -33,7 +32,7 @@ public final class BoneyardScourge extends CardImpl { static { filter.add(SubType.DRAGON.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public BoneyardScourge(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BoomBust.java b/Mage.Sets/src/mage/cards/b/BoomBust.java index 99698abf59a..93ef27e8ba1 100644 --- a/Mage.Sets/src/mage/cards/b/BoomBust.java +++ b/Mage.Sets/src/mage/cards/b/BoomBust.java @@ -12,7 +12,6 @@ import mage.constants.SpellAbilityType; import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; public final class BoomBust extends SplitCard { @@ -21,8 +20,8 @@ public final class BoomBust extends SplitCard { private static final FilterLandPermanent filter2 = new FilterLandPermanent("land you don't control"); static { - filter1.add(new ControllerPredicate(TargetController.YOU)); - filter2.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter1.add(TargetController.YOU.getControllerPredicate()); + filter2.add(TargetController.NOT_YOU.getControllerPredicate()); } public BoomBust(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BorderlandBehemoth.java b/Mage.Sets/src/mage/cards/b/BorderlandBehemoth.java index a07727449c4..b1725f519eb 100644 --- a/Mage.Sets/src/mage/cards/b/BorderlandBehemoth.java +++ b/Mage.Sets/src/mage/cards/b/BorderlandBehemoth.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.PermanentIdPredicate; /** @@ -36,7 +35,7 @@ public final class BorderlandBehemoth extends CardImpl { FilterCreaturePermanent filter = new FilterCreaturePermanent("other Giant you control"); filter.add(SubType.GIANT.getPredicate()); filter.add(Predicates.not(new PermanentIdPredicate(this.getId()))); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); DynamicValue xValue = new PermanentsOnBattlefieldCount(filter, 4); Effect effect = new BoostSourceEffect(xValue, xValue, Duration.WhileOnBattlefield, false); effect.setText("{this} gets +4/+4 for each other Giant you control"); diff --git a/Mage.Sets/src/mage/cards/b/BoundlessRealms.java b/Mage.Sets/src/mage/cards/b/BoundlessRealms.java index 6d8c76a0e69..77674826d4a 100644 --- a/Mage.Sets/src/mage/cards/b/BoundlessRealms.java +++ b/Mage.Sets/src/mage/cards/b/BoundlessRealms.java @@ -13,7 +13,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; @@ -66,7 +65,7 @@ class BoundlessRealmsEffect extends OneShotEffect { return false; } FilterLandPermanent filter = new FilterLandPermanent(); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); int amount = new PermanentsOnBattlefieldCount(filter).calculate(game, source, this); TargetCardInLibrary target = new TargetCardInLibrary(0, amount, StaticFilters.FILTER_CARD_BASIC_LAND); diff --git a/Mage.Sets/src/mage/cards/b/BrazenBorrower.java b/Mage.Sets/src/mage/cards/b/BrazenBorrower.java index 9a7d91a18c7..97fedec7d90 100644 --- a/Mage.Sets/src/mage/cards/b/BrazenBorrower.java +++ b/Mage.Sets/src/mage/cards/b/BrazenBorrower.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import java.util.UUID; @@ -26,7 +25,7 @@ public final class BrazenBorrower extends AdventureCard { = new FilterNonlandPermanent("nonland permanent an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public BrazenBorrower(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BreakOpen.java b/Mage.Sets/src/mage/cards/b/BreakOpen.java index 275c9fc7fb2..60df5e30ab4 100644 --- a/Mage.Sets/src/mage/cards/b/BreakOpen.java +++ b/Mage.Sets/src/mage/cards/b/BreakOpen.java @@ -9,7 +9,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.other.FaceDownPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -22,7 +21,7 @@ public final class BreakOpen extends CardImpl { static { filter.add(FaceDownPredicate.instance); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public BreakOpen(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BrutalHordechief.java b/Mage.Sets/src/mage/cards/b/BrutalHordechief.java index c6e43f6dc7e..d07da397264 100644 --- a/Mage.Sets/src/mage/cards/b/BrutalHordechief.java +++ b/Mage.Sets/src/mage/cards/b/BrutalHordechief.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.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -33,7 +32,7 @@ public final class BrutalHordechief extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public BrutalHordechief(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/ButcherOfMalakir.java b/Mage.Sets/src/mage/cards/b/ButcherOfMalakir.java index 6d6de2022c9..c3f0b4fd037 100644 --- a/Mage.Sets/src/mage/cards/b/ButcherOfMalakir.java +++ b/Mage.Sets/src/mage/cards/b/ButcherOfMalakir.java @@ -23,7 +23,7 @@ public final class ButcherOfMalakir extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public ButcherOfMalakir(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CalmingVerse.java b/Mage.Sets/src/mage/cards/c/CalmingVerse.java index 3c74e14024e..a0efbbd80cf 100644 --- a/Mage.Sets/src/mage/cards/c/CalmingVerse.java +++ b/Mage.Sets/src/mage/cards/c/CalmingVerse.java @@ -13,7 +13,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledEnchantmentPermanent; import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -55,7 +54,7 @@ class CalmingVerseEffect extends OneShotEffect { private static final FilterEnchantmentPermanent opponentEnchantmentsFilter = new FilterEnchantmentPermanent("enchantments you don't control"); static { - opponentEnchantmentsFilter.add(new ControllerPredicate(TargetController.OPPONENT)); + opponentEnchantmentsFilter.add(TargetController.OPPONENT.getControllerPredicate()); } private static final FilterControlledEnchantmentPermanent controlledEnchantmentsFilter = new FilterControlledEnchantmentPermanent("enchantments you control"); diff --git a/Mage.Sets/src/mage/cards/c/CapriciousEfreet.java b/Mage.Sets/src/mage/cards/c/CapriciousEfreet.java index 810996656c1..dbf8c60212c 100644 --- a/Mage.Sets/src/mage/cards/c/CapriciousEfreet.java +++ b/Mage.Sets/src/mage/cards/c/CapriciousEfreet.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -32,8 +31,8 @@ public final class CapriciousEfreet extends CardImpl { private static final FilterNonlandPermanent filterNotControlled = new FilterNonlandPermanent("nonland permanent you don't control"); static { - filterControlled.add(new ControllerPredicate(TargetController.YOU)); - filterNotControlled.add(new ControllerPredicate(TargetController.NOT_YOU)); + filterControlled.add(TargetController.YOU.getControllerPredicate()); + filterNotControlled.add(TargetController.NOT_YOU.getControllerPredicate()); } public CapriciousEfreet(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CaptainLanneryStorm.java b/Mage.Sets/src/mage/cards/c/CaptainLanneryStorm.java index 91098d65efd..90524e2470d 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainLanneryStorm.java +++ b/Mage.Sets/src/mage/cards/c/CaptainLanneryStorm.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.TreasureToken; /** @@ -29,7 +28,7 @@ public final class CaptainLanneryStorm extends CardImpl { static { filter.add(SubType.TREASURE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public CaptainLanneryStorm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CaptivatingCrew.java b/Mage.Sets/src/mage/cards/c/CaptivatingCrew.java index e1991d79b46..49ef1734cf5 100644 --- a/Mage.Sets/src/mage/cards/c/CaptivatingCrew.java +++ b/Mage.Sets/src/mage/cards/c/CaptivatingCrew.java @@ -19,7 +19,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -31,7 +30,7 @@ public final class CaptivatingCrew extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public CaptivatingCrew(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CapturedByTheConsulate.java b/Mage.Sets/src/mage/cards/c/CapturedByTheConsulate.java index 66dedbd9d56..ba7199bed2a 100644 --- a/Mage.Sets/src/mage/cards/c/CapturedByTheConsulate.java +++ b/Mage.Sets/src/mage/cards/c/CapturedByTheConsulate.java @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -36,7 +35,7 @@ public final class CapturedByTheConsulate extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public CapturedByTheConsulate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CarelessCelebrant.java b/Mage.Sets/src/mage/cards/c/CarelessCelebrant.java index 20d0cc7983c..6b97dd3bd2f 100644 --- a/Mage.Sets/src/mage/cards/c/CarelessCelebrant.java +++ b/Mage.Sets/src/mage/cards/c/CarelessCelebrant.java @@ -11,7 +11,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import java.util.UUID; @@ -25,7 +24,7 @@ public final class CarelessCelebrant extends CardImpl { = new FilterPermanent("creature or planeswalker an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filter.add(Predicates.or( CardType.CREATURE.getPredicate(), CardType.PLANESWALKER.getPredicate() diff --git a/Mage.Sets/src/mage/cards/c/CastOut.java b/Mage.Sets/src/mage/cards/c/CastOut.java index 80465f8c2b4..df32a33d382 100644 --- a/Mage.Sets/src/mage/cards/c/CastOut.java +++ b/Mage.Sets/src/mage/cards/c/CastOut.java @@ -15,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; /** @@ -27,7 +26,7 @@ public final class CastOut extends CardImpl { private static final FilterNonlandPermanent filter = new FilterNonlandPermanent(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public CastOut(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CatacombSifter.java b/Mage.Sets/src/mage/cards/c/CatacombSifter.java index 1ea063803cf..5bc4b338a7f 100644 --- a/Mage.Sets/src/mage/cards/c/CatacombSifter.java +++ b/Mage.Sets/src/mage/cards/c/CatacombSifter.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.EldraziScionToken; /** @@ -27,7 +26,7 @@ public final class CatacombSifter extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you control"); static { filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public CatacombSifter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CaughtInTheBrights.java b/Mage.Sets/src/mage/cards/c/CaughtInTheBrights.java index b625d34334c..35f31872054 100644 --- a/Mage.Sets/src/mage/cards/c/CaughtInTheBrights.java +++ b/Mage.Sets/src/mage/cards/c/CaughtInTheBrights.java @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -26,7 +25,7 @@ public final class CaughtInTheBrights extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Vehicle you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.VEHICLE.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/c/CavalcadeOfCalamity.java b/Mage.Sets/src/mage/cards/c/CavalcadeOfCalamity.java index 7c7f863bad6..ff23a54c38f 100644 --- a/Mage.Sets/src/mage/cards/c/CavalcadeOfCalamity.java +++ b/Mage.Sets/src/mage/cards/c/CavalcadeOfCalamity.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import java.util.UUID; @@ -22,7 +21,7 @@ public final class CavalcadeOfCalamity extends CardImpl { = new FilterCreaturePermanent("creaure you control with power 1 or less"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(new PowerPredicate(ComparisonType.FEWER_THAN, 2)); } diff --git a/Mage.Sets/src/mage/cards/c/CavalierOfFlame.java b/Mage.Sets/src/mage/cards/c/CavalierOfFlame.java index 6021ff05049..79dc2259459 100644 --- a/Mage.Sets/src/mage/cards/c/CavalierOfFlame.java +++ b/Mage.Sets/src/mage/cards/c/CavalierOfFlame.java @@ -20,7 +20,6 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterPlaneswalkerPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInHand; @@ -36,7 +35,7 @@ public final class CavalierOfFlame extends CardImpl { private static final FilterPermanent filter = new FilterPlaneswalkerPermanent(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public CavalierOfFlame(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChainedToTheRocks.java b/Mage.Sets/src/mage/cards/c/ChainedToTheRocks.java index 4cff3a15976..67e116ff970 100644 --- a/Mage.Sets/src/mage/cards/c/ChainedToTheRocks.java +++ b/Mage.Sets/src/mage/cards/c/ChainedToTheRocks.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -67,7 +66,7 @@ public final class ChainedToTheRocks extends CardImpl { static { filter.add(SubType.MOUNTAIN.getPredicate()); - filterTarget.add(new ControllerPredicate(TargetController.OPPONENT)); + filterTarget.add(TargetController.OPPONENT.getControllerPredicate()); } public ChainedToTheRocks(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChainerNightmareAdept.java b/Mage.Sets/src/mage/cards/c/ChainerNightmareAdept.java index 8d82cb6d1e5..86a5d53c4fe 100644 --- a/Mage.Sets/src/mage/cards/c/ChainerNightmareAdept.java +++ b/Mage.Sets/src/mage/cards/c/ChainerNightmareAdept.java @@ -19,7 +19,6 @@ import mage.filter.StaticFilters; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -170,7 +169,7 @@ class ChainerNightmareAdeptTriggeredAbility extends EntersBattlefieldAllTriggere static { filter.add(Predicates.not(TokenPredicate.instance)); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java b/Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java index 8040e0c0374..20158259a6a 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfLambholt.java @@ -12,7 +12,6 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -27,7 +26,7 @@ public final class ChampionOfLambholt extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public ChampionOfLambholt(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChancellorOfTheForge.java b/Mage.Sets/src/mage/cards/c/ChancellorOfTheForge.java index 70285f2e546..2a9dc6fc88c 100644 --- a/Mage.Sets/src/mage/cards/c/ChancellorOfTheForge.java +++ b/Mage.Sets/src/mage/cards/c/ChancellorOfTheForge.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -31,7 +30,7 @@ public final class ChancellorOfTheForge extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public ChancellorOfTheForge(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChandrasTriumph.java b/Mage.Sets/src/mage/cards/c/ChandrasTriumph.java index 9ce80e45f7b..7cfc8e92881 100644 --- a/Mage.Sets/src/mage/cards/c/ChandrasTriumph.java +++ b/Mage.Sets/src/mage/cards/c/ChandrasTriumph.java @@ -11,7 +11,6 @@ import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPlaneswalkerPermanent; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -27,7 +26,7 @@ public final class ChandrasTriumph extends CardImpl { = new FilterCreatureOrPlaneswalkerPermanent("creature or planeswalker an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ChandrasTriumph(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChemistersTrick.java b/Mage.Sets/src/mage/cards/c/ChemistersTrick.java index 25474bc5cbd..06b57c3cdb0 100644 --- a/Mage.Sets/src/mage/cards/c/ChemistersTrick.java +++ b/Mage.Sets/src/mage/cards/c/ChemistersTrick.java @@ -16,7 +16,6 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -32,7 +31,7 @@ public final class ChemistersTrick extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public ChemistersTrick(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChewbaccaTheBeast.java b/Mage.Sets/src/mage/cards/c/ChewbaccaTheBeast.java index f7ffe1d408b..32f2375eed3 100644 --- a/Mage.Sets/src/mage/cards/c/ChewbaccaTheBeast.java +++ b/Mage.Sets/src/mage/cards/c/ChewbaccaTheBeast.java @@ -11,10 +11,8 @@ import mage.constants.*; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AnotherTargetPredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.AttackingPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -26,7 +24,7 @@ public final class ChewbaccaTheBeast extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target attacking creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); filter.add(AttackingPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/c/ChiefChirpa.java b/Mage.Sets/src/mage/cards/c/ChiefChirpa.java index 5a6e153ea10..9156c569d93 100644 --- a/Mage.Sets/src/mage/cards/c/ChiefChirpa.java +++ b/Mage.Sets/src/mage/cards/c/ChiefChirpa.java @@ -21,7 +21,6 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.EwokToken; import mage.target.common.TargetControlledCreaturePermanent; @@ -36,7 +35,7 @@ public final class ChiefChirpa extends CardImpl { static { diedFilter.add(new ColorPredicate(ObjectColor.GREEN)); - diedFilter.add(new ControllerPredicate(TargetController.YOU)); + diedFilter.add(TargetController.YOU.getControllerPredicate()); ewokFilter.add(SubType.EWOK.getPredicate()); ewokFilter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/c/ChiefOfTheFoundry.java b/Mage.Sets/src/mage/cards/c/ChiefOfTheFoundry.java index b51bc2f9107..42306dc2184 100644 --- a/Mage.Sets/src/mage/cards/c/ChiefOfTheFoundry.java +++ b/Mage.Sets/src/mage/cards/c/ChiefOfTheFoundry.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class ChiefOfTheFoundry extends CardImpl { static { filterBoosted.add(CardType.ARTIFACT.getPredicate()); - filterBoosted.add(new ControllerPredicate(TargetController.YOU)); + filterBoosted.add(TargetController.YOU.getControllerPredicate()); } public ChiefOfTheFoundry(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChiseiHeartOfOceans.java b/Mage.Sets/src/mage/cards/c/ChiseiHeartOfOceans.java index 916b686a1cb..61ce2b35e10 100644 --- a/Mage.Sets/src/mage/cards/c/ChiseiHeartOfOceans.java +++ b/Mage.Sets/src/mage/cards/c/ChiseiHeartOfOceans.java @@ -15,7 +15,6 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterAnyPredicate; import mage.target.TargetPermanent; @@ -28,7 +27,7 @@ public final class ChiseiHeartOfOceans extends CardImpl { private static final FilterPermanent filter = new FilterControlledPermanent("remove a counter from a permanent you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(CounterAnyPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/c/ChromeshellCrab.java b/Mage.Sets/src/mage/cards/c/ChromeshellCrab.java index 5e5b7e28fe3..ccd6a0f9a7e 100644 --- a/Mage.Sets/src/mage/cards/c/ChromeshellCrab.java +++ b/Mage.Sets/src/mage/cards/c/ChromeshellCrab.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -31,7 +30,7 @@ public final class ChromeshellCrab extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ChromeshellCrab(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChroniclerOfHeroes.java b/Mage.Sets/src/mage/cards/c/ChroniclerOfHeroes.java index a00505e1570..0915439a16e 100644 --- a/Mage.Sets/src/mage/cards/c/ChroniclerOfHeroes.java +++ b/Mage.Sets/src/mage/cards/c/ChroniclerOfHeroes.java @@ -14,7 +14,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; import mage.game.Game; import mage.players.Player; @@ -53,7 +52,7 @@ class ChroniclerOfHeroesEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with a +1/+1 counter on it"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(new CounterPredicate(CounterType.P1P1)); } diff --git a/Mage.Sets/src/mage/cards/c/CitanulDruid.java b/Mage.Sets/src/mage/cards/c/CitanulDruid.java index 975581e0403..9eb93c1b9ed 100644 --- a/Mage.Sets/src/mage/cards/c/CitanulDruid.java +++ b/Mage.Sets/src/mage/cards/c/CitanulDruid.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterArtifactSpell; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -22,7 +21,7 @@ public final class CitanulDruid extends CardImpl { private static final FilterArtifactSpell filter = new FilterArtifactSpell(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/c/ClackbridgeTroll.java b/Mage.Sets/src/mage/cards/c/ClackbridgeTroll.java index 840d9513d00..b3e3b9805ed 100644 --- a/Mage.Sets/src/mage/cards/c/ClackbridgeTroll.java +++ b/Mage.Sets/src/mage/cards/c/ClackbridgeTroll.java @@ -15,7 +15,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.GoatToken; @@ -96,7 +95,7 @@ class ClackbridgeTrollEffect extends OneShotEffect { } FilterControlledPermanent filter = new FilterControlledPermanent("creature to sacrifice"); filter.add(CardType.CREATURE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); TargetControlledPermanent target = new TargetControlledPermanent(filter); target.setNotTarget(true); if (!target.canChoose(opponent.getId(), game) diff --git a/Mage.Sets/src/mage/cards/c/ClawsOfValakut.java b/Mage.Sets/src/mage/cards/c/ClawsOfValakut.java index f2994ad82bd..0684f8d3680 100644 --- a/Mage.Sets/src/mage/cards/c/ClawsOfValakut.java +++ b/Mage.Sets/src/mage/cards/c/ClawsOfValakut.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -28,7 +27,7 @@ public final class ClawsOfValakut extends CardImpl { static { filter.add(SubType.MOUNTAIN.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public ClawsOfValakut (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ClearShot.java b/Mage.Sets/src/mage/cards/c/ClearShot.java index 6565c4f52fe..9b437d0a9bc 100644 --- a/Mage.Sets/src/mage/cards/c/ClearShot.java +++ b/Mage.Sets/src/mage/cards/c/ClearShot.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -24,7 +23,7 @@ public final class ClearShot extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public ClearShot(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ClericOfTheForwardOrder.java b/Mage.Sets/src/mage/cards/c/ClericOfTheForwardOrder.java index 778ca7d366c..bb6d47971a2 100644 --- a/Mage.Sets/src/mage/cards/c/ClericOfTheForwardOrder.java +++ b/Mage.Sets/src/mage/cards/c/ClericOfTheForwardOrder.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class ClericOfTheForwardOrder extends CardImpl { static { filter.add(new NamePredicate("Cleric of the Forward Order")); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public ClericOfTheForwardOrder(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CloseQuarters.java b/Mage.Sets/src/mage/cards/c/CloseQuarters.java index 1d0fa5519cc..6746006ef30 100644 --- a/Mage.Sets/src/mage/cards/c/CloseQuarters.java +++ b/Mage.Sets/src/mage/cards/c/CloseQuarters.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetAnyTarget; /** @@ -22,7 +21,7 @@ public final class CloseQuarters extends CardImpl { static final private FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public CloseQuarters(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CloudstoneCurio.java b/Mage.Sets/src/mage/cards/c/CloudstoneCurio.java index d05f6ab05e2..e684313621c 100644 --- a/Mage.Sets/src/mage/cards/c/CloudstoneCurio.java +++ b/Mage.Sets/src/mage/cards/c/CloudstoneCurio.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.PermanentIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -29,7 +28,7 @@ public final class CloudstoneCurio extends CardImpl { static { filter.add(Predicates.not(CardType.ARTIFACT.getPredicate())); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public CloudstoneCurio(UUID ownerId, CardSetInfo setInfo) { @@ -77,7 +76,7 @@ class CloudstoneCurioEffect extends OneShotEffect { if (triggeringCreature != null) { FilterPermanent filter = new FilterPermanent("another permanent you control that shares a permanent type with " + triggeringCreature.getName()); filter.add(Predicates.not(new PermanentIdPredicate(triggeringCreature.getId()))); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.or( triggeringCreature .getCardType() diff --git a/Mage.Sets/src/mage/cards/c/ConclaveTribunal.java b/Mage.Sets/src/mage/cards/c/ConclaveTribunal.java index ca5fec47016..3a65a9894dc 100644 --- a/Mage.Sets/src/mage/cards/c/ConclaveTribunal.java +++ b/Mage.Sets/src/mage/cards/c/ConclaveTribunal.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; /** @@ -24,7 +23,7 @@ public final class ConclaveTribunal extends CardImpl { private static final FilterNonlandPermanent filter = new FilterNonlandPermanent(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ConclaveTribunal(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ConjuredCurrency.java b/Mage.Sets/src/mage/cards/c/ConjuredCurrency.java index e6f3c66bef0..efae881f116 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.permanent.ControllerPredicate; import mage.target.TargetPermanent; /** @@ -23,7 +22,7 @@ public final class ConjuredCurrency extends CardImpl { static { filter.add(TargetController.NOT_YOU.getOwnerPredicate()); - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } 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/c/ConqueringManticore.java b/Mage.Sets/src/mage/cards/c/ConqueringManticore.java index 0b77f3e9d53..6227a0f763e 100644 --- a/Mage.Sets/src/mage/cards/c/ConqueringManticore.java +++ b/Mage.Sets/src/mage/cards/c/ConqueringManticore.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -29,7 +28,7 @@ public final class ConqueringManticore extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ConqueringManticore(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ConstrictingSliver.java b/Mage.Sets/src/mage/cards/c/ConstrictingSliver.java index 8d8d0687a90..8273705b516 100644 --- a/Mage.Sets/src/mage/cards/c/ConstrictingSliver.java +++ b/Mage.Sets/src/mage/cards/c/ConstrictingSliver.java @@ -15,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -30,7 +29,7 @@ public final class ConstrictingSliver extends CardImpl { private static final FilterCreaturePermanent filterTarget = new FilterCreaturePermanent("creature an opponent controls"); static { - filterTarget.add(new ControllerPredicate(TargetController.OPPONENT)); + filterTarget.add(TargetController.OPPONENT.getControllerPredicate()); } public ConstrictingSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ConsulateCrackdown.java b/Mage.Sets/src/mage/cards/c/ConsulateCrackdown.java index 164a7c77f30..c28bef24d5e 100644 --- a/Mage.Sets/src/mage/cards/c/ConsulateCrackdown.java +++ b/Mage.Sets/src/mage/cards/c/ConsulateCrackdown.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -50,7 +49,7 @@ class ConsulateCracksownExileEffect extends OneShotEffect { private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("artifacts your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ConsulateCracksownExileEffect() { diff --git a/Mage.Sets/src/mage/cards/c/ConsumingVapors.java b/Mage.Sets/src/mage/cards/c/ConsumingVapors.java index e443ca63cd9..6653e4a7e5f 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumingVapors.java +++ b/Mage.Sets/src/mage/cards/c/ConsumingVapors.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -66,7 +65,7 @@ class ConsumingVaporsEffect extends OneShotEffect { FilterControlledPermanent filter = new FilterControlledPermanent("creature"); filter.add(CardType.CREATURE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); TargetControlledPermanent target = new TargetControlledPermanent(1, 1, filter, true); //A spell or ability could have removed the only legal target this player diff --git a/Mage.Sets/src/mage/cards/c/ContestedCliffs.java b/Mage.Sets/src/mage/cards/c/ContestedCliffs.java index 4ae8afdec01..3b661c55f12 100644 --- a/Mage.Sets/src/mage/cards/c/ContestedCliffs.java +++ b/Mage.Sets/src/mage/cards/c/ContestedCliffs.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; @@ -29,9 +28,9 @@ public final class ContestedCliffs extends CardImpl { private static final FilterCreaturePermanent filter1 = new FilterCreaturePermanent("Beast creature you control"); private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creature an opponent controls"); static { - filter1.add(new ControllerPredicate(TargetController.YOU)); + filter1.add(TargetController.YOU.getControllerPredicate()); filter1.add(SubType.BEAST.getPredicate()); - filter2.add(new ControllerPredicate(TargetController.OPPONENT)); + filter2.add(TargetController.OPPONENT.getControllerPredicate()); } public ContestedCliffs(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CopperhoofVorrac.java b/Mage.Sets/src/mage/cards/c/CopperhoofVorrac.java index 0a48307d1fe..fd2b057d1bd 100644 --- a/Mage.Sets/src/mage/cards/c/CopperhoofVorrac.java +++ b/Mage.Sets/src/mage/cards/c/CopperhoofVorrac.java @@ -15,7 +15,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; /** @@ -29,7 +28,7 @@ public final class CopperhoofVorrac extends CardImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public CopperhoofVorrac(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/Corrupt.java b/Mage.Sets/src/mage/cards/c/Corrupt.java index d447bcfce22..d9b05172a77 100644 --- a/Mage.Sets/src/mage/cards/c/Corrupt.java +++ b/Mage.Sets/src/mage/cards/c/Corrupt.java @@ -12,7 +12,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -49,7 +48,7 @@ class CorruptEffect extends OneShotEffect { static { filter.add(SubType.SWAMP.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public CorruptEffect() { diff --git a/Mage.Sets/src/mage/cards/c/Counterflux.java b/Mage.Sets/src/mage/cards/c/Counterflux.java index 4f3703148bc..3a688deb879 100644 --- a/Mage.Sets/src/mage/cards/c/Counterflux.java +++ b/Mage.Sets/src/mage/cards/c/Counterflux.java @@ -19,7 +19,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterSpell; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.stack.Spell; import mage.game.stack.StackObject; @@ -35,7 +34,7 @@ public final class Counterflux extends CardImpl { private static final FilterSpell filter = new FilterSpell("spell you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public Counterflux(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CourtStreetDenizen.java b/Mage.Sets/src/mage/cards/c/CourtStreetDenizen.java index 6c4fad4bf0e..c5d76876604 100644 --- a/Mage.Sets/src/mage/cards/c/CourtStreetDenizen.java +++ b/Mage.Sets/src/mage/cards/c/CourtStreetDenizen.java @@ -17,7 +17,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -31,8 +30,8 @@ public final class CourtStreetDenizen extends CardImpl { static { filter.add(AnotherPredicate.instance); filter.add(new ColorPredicate(ObjectColor.WHITE)); - filter.add(new ControllerPredicate(TargetController.YOU)); - filterOpponentCreature.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.YOU.getControllerPredicate()); + filterOpponentCreature.add(TargetController.OPPONENT.getControllerPredicate()); } public CourtStreetDenizen(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); diff --git a/Mage.Sets/src/mage/cards/c/CowerInFear.java b/Mage.Sets/src/mage/cards/c/CowerInFear.java index eecb31ef0aa..15777b477ee 100644 --- a/Mage.Sets/src/mage/cards/c/CowerInFear.java +++ b/Mage.Sets/src/mage/cards/c/CowerInFear.java @@ -9,7 +9,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -20,7 +19,7 @@ public final class CowerInFear extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public CowerInFear(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CraterhoofBehemoth.java b/Mage.Sets/src/mage/cards/c/CraterhoofBehemoth.java index 68aade09119..5b56108b8f7 100644 --- a/Mage.Sets/src/mage/cards/c/CraterhoofBehemoth.java +++ b/Mage.Sets/src/mage/cards/c/CraterhoofBehemoth.java @@ -16,7 +16,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -28,7 +27,7 @@ public final class CraterhoofBehemoth extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public CraterhoofBehemoth(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CrownedCeratok.java b/Mage.Sets/src/mage/cards/c/CrownedCeratok.java index 480100ad8cf..d92b5babd4c 100644 --- a/Mage.Sets/src/mage/cards/c/CrownedCeratok.java +++ b/Mage.Sets/src/mage/cards/c/CrownedCeratok.java @@ -15,7 +15,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; /** @@ -27,7 +26,7 @@ public final class CrownedCeratok extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Each creature you control with a +1/+1 counter on it"); static { filter.add(new CounterPredicate(CounterType.P1P1)); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public CrownedCeratok(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CrucibleOfFire.java b/Mage.Sets/src/mage/cards/c/CrucibleOfFire.java index 0905cfe66fe..3735fc8f88b 100644 --- a/Mage.Sets/src/mage/cards/c/CrucibleOfFire.java +++ b/Mage.Sets/src/mage/cards/c/CrucibleOfFire.java @@ -8,7 +8,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -18,7 +17,7 @@ public final class CrucibleOfFire extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Dragon creatures"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.DRAGON.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/c/CruelCelebrant.java b/Mage.Sets/src/mage/cards/c/CruelCelebrant.java index 03d9815abf6..d66ef8817a9 100644 --- a/Mage.Sets/src/mage/cards/c/CruelCelebrant.java +++ b/Mage.Sets/src/mage/cards/c/CruelCelebrant.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -24,7 +23,7 @@ public final class CruelCelebrant extends CardImpl { private static final FilterCreatureOrPlaneswalkerPermanent filter = new FilterCreatureOrPlaneswalkerPermanent("creature or planeswalker you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public CruelCelebrant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CrusadingKnight.java b/Mage.Sets/src/mage/cards/c/CrusadingKnight.java index 8cb0d0ca149..f31e7153e4b 100644 --- a/Mage.Sets/src/mage/cards/c/CrusadingKnight.java +++ b/Mage.Sets/src/mage/cards/c/CrusadingKnight.java @@ -23,7 +23,7 @@ public final class CrusadingKnight extends CardImpl { private static final FilterLandPermanent swampFilter = new FilterLandPermanent("Swamp your opponent controls"); static { swampFilter.add(SubType.SWAMP.getPredicate()); - swampFilter.add(new ControllerPredicate(TargetController.OPPONENT)); + swampFilter.add(TargetController.OPPONENT.getControllerPredicate()); } public CrusadingKnight(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/Crypsis.java b/Mage.Sets/src/mage/cards/c/Crypsis.java index bafe13a113c..e83468cc136 100644 --- a/Mage.Sets/src/mage/cards/c/Crypsis.java +++ b/Mage.Sets/src/mage/cards/c/Crypsis.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.FilterCard; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -25,7 +24,7 @@ public final class Crypsis extends CardImpl { static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public Crypsis(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CrypticCommand.java b/Mage.Sets/src/mage/cards/c/CrypticCommand.java index 445a6cfbe86..0e18a518bad 100644 --- a/Mage.Sets/src/mage/cards/c/CrypticCommand.java +++ b/Mage.Sets/src/mage/cards/c/CrypticCommand.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -66,7 +65,7 @@ class CrypticCommandEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public CrypticCommandEffect() { diff --git a/Mage.Sets/src/mage/cards/c/CunningEvasion.java b/Mage.Sets/src/mage/cards/c/CunningEvasion.java index 2f6e85cca12..26bd37fbbb4 100644 --- a/Mage.Sets/src/mage/cards/c/CunningEvasion.java +++ b/Mage.Sets/src/mage/cards/c/CunningEvasion.java @@ -7,7 +7,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -19,7 +18,7 @@ public final class CunningEvasion extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public CunningEvasion(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CyclonicRift.java b/Mage.Sets/src/mage/cards/c/CyclonicRift.java index 0674d1242d3..e23d1a917d3 100644 --- a/Mage.Sets/src/mage/cards/c/CyclonicRift.java +++ b/Mage.Sets/src/mage/cards/c/CyclonicRift.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetNonlandPermanent; /** @@ -24,7 +23,7 @@ public final class CyclonicRift extends CardImpl { private static final FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanent you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public CyclonicRift(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DampeningPulse.java b/Mage.Sets/src/mage/cards/d/DampeningPulse.java index 54998b8e2ce..95f724b1910 100644 --- a/Mage.Sets/src/mage/cards/d/DampeningPulse.java +++ b/Mage.Sets/src/mage/cards/d/DampeningPulse.java @@ -11,7 +11,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -22,7 +21,7 @@ public final class DampeningPulse extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public DampeningPulse(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DaringThief.java b/Mage.Sets/src/mage/cards/d/DaringThief.java index 6ad173e81be..ccbe7fdc1ce 100644 --- a/Mage.Sets/src/mage/cards/d/DaringThief.java +++ b/Mage.Sets/src/mage/cards/d/DaringThief.java @@ -19,7 +19,6 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -132,7 +131,7 @@ class DaringThiefSecondTarget extends TargetPermanent { public DaringThiefSecondTarget() { super(); this.filter = this.filter.copy(); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); setTargetName("permanent an opponent controls that shares a card type with it"); } diff --git a/Mage.Sets/src/mage/cards/d/DarkIntimations.java b/Mage.Sets/src/mage/cards/d/DarkIntimations.java index 140fa554e17..d01a05305bb 100644 --- a/Mage.Sets/src/mage/cards/d/DarkIntimations.java +++ b/Mage.Sets/src/mage/cards/d/DarkIntimations.java @@ -18,7 +18,6 @@ import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.EntersTheBattlefieldEvent; import mage.game.events.GameEvent; @@ -97,7 +96,7 @@ class DarkIntimationsEffect extends OneShotEffect { return false; } List perms = new ArrayList<>(); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); for (UUID playerId : game.getOpponents(source.getControllerId())) { Player player = game.getPlayer(playerId); if (player != null) { diff --git a/Mage.Sets/src/mage/cards/d/DarkProphecy.java b/Mage.Sets/src/mage/cards/d/DarkProphecy.java index 4881da9516f..9d085d57b88 100644 --- a/Mage.Sets/src/mage/cards/d/DarkProphecy.java +++ b/Mage.Sets/src/mage/cards/d/DarkProphecy.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -22,7 +21,7 @@ public final class DarkProphecy extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public DarkProphecy(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DayOfTheDragons.java b/Mage.Sets/src/mage/cards/d/DayOfTheDragons.java index f9e3ecd495f..e8ce8301e8a 100644 --- a/Mage.Sets/src/mage/cards/d/DayOfTheDragons.java +++ b/Mage.Sets/src/mage/cards/d/DayOfTheDragons.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.ExileZone; import mage.game.Game; import mage.game.permanent.Permanent; @@ -54,7 +53,7 @@ class DayOfTheDragonsEntersEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterPermanent("all creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(CardType.CREATURE.getPredicate()); } @@ -96,7 +95,7 @@ class DayOfTheDragonsLeavesEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterPermanent("all Dragons you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.DRAGON.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/d/DeadGone.java b/Mage.Sets/src/mage/cards/d/DeadGone.java index 5b4ad47b997..ac7f2c28286 100644 --- a/Mage.Sets/src/mage/cards/d/DeadGone.java +++ b/Mage.Sets/src/mage/cards/d/DeadGone.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SpellAbilityType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -21,7 +20,7 @@ public final class DeadGone extends SplitCard { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public DeadGone(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DeadMansChest.java b/Mage.Sets/src/mage/cards/d/DeadMansChest.java index 1a20378b824..e58edc5f0db 100644 --- a/Mage.Sets/src/mage/cards/d/DeadMansChest.java +++ b/Mage.Sets/src/mage/cards/d/DeadMansChest.java @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.ManaPoolItem; @@ -35,7 +34,7 @@ public final class DeadMansChest extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public DeadMansChest(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DeadeyePlunderers.java b/Mage.Sets/src/mage/cards/d/DeadeyePlunderers.java index 0d1d72186aa..121c9501904 100644 --- a/Mage.Sets/src/mage/cards/d/DeadeyePlunderers.java +++ b/Mage.Sets/src/mage/cards/d/DeadeyePlunderers.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.TreasureToken; /** @@ -30,7 +29,7 @@ public final class DeadeyePlunderers extends CardImpl { static { filter.add(CardType.ARTIFACT.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public DeadeyePlunderers(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DeathPitOffering.java b/Mage.Sets/src/mage/cards/d/DeathPitOffering.java index 874d49ab289..c64ba172cb8 100644 --- a/Mage.Sets/src/mage/cards/d/DeathPitOffering.java +++ b/Mage.Sets/src/mage/cards/d/DeathPitOffering.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -26,7 +25,7 @@ public final class DeathPitOffering extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public DeathPitOffering(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DeceiverExarch.java b/Mage.Sets/src/mage/cards/d/DeceiverExarch.java index 04fa192c341..7ea675785ab 100644 --- a/Mage.Sets/src/mage/cards/d/DeceiverExarch.java +++ b/Mage.Sets/src/mage/cards/d/DeceiverExarch.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; @@ -28,7 +27,7 @@ public final class DeceiverExarch extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("permanent an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public DeceiverExarch(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DeepSeaKraken.java b/Mage.Sets/src/mage/cards/d/DeepSeaKraken.java index 0d02f4049b5..140ae9d0f91 100644 --- a/Mage.Sets/src/mage/cards/d/DeepSeaKraken.java +++ b/Mage.Sets/src/mage/cards/d/DeepSeaKraken.java @@ -19,7 +19,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterSpell; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -30,7 +29,7 @@ public final class DeepSeaKraken extends CardImpl { private static final FilterSpell filter = new FilterSpell("an opponent casts"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public DeepSeaKraken(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DeeprootElite.java b/Mage.Sets/src/mage/cards/d/DeeprootElite.java index ca4130031cb..65e8100f0ff 100644 --- a/Mage.Sets/src/mage/cards/d/DeeprootElite.java +++ b/Mage.Sets/src/mage/cards/d/DeeprootElite.java @@ -15,7 +15,6 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -27,12 +26,12 @@ public final class DeeprootElite extends CardImpl { private static final FilterPermanent filterYourAnotherMerfolk = new FilterPermanent(SubType.MERFOLK, "another " + SubType.MERFOLK.toString()); static { filterYourAnotherMerfolk.add(AnotherPredicate.instance); - filterYourAnotherMerfolk.add(new ControllerPredicate(TargetController.YOU)); + filterYourAnotherMerfolk.add(TargetController.YOU.getControllerPredicate()); } private static final FilterControlledCreaturePermanent filterYourAnyMerfolk = new FilterControlledCreaturePermanent(SubType.MERFOLK); static { - filterYourAnyMerfolk.add(new ControllerPredicate(TargetController.YOU)); + filterYourAnyMerfolk.add(TargetController.YOU.getControllerPredicate()); } public DeeprootElite(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DeepwaterHypnotist.java b/Mage.Sets/src/mage/cards/d/DeepwaterHypnotist.java index 3e1010f5582..44f2bc8c663 100644 --- a/Mage.Sets/src/mage/cards/d/DeepwaterHypnotist.java +++ b/Mage.Sets/src/mage/cards/d/DeepwaterHypnotist.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -25,7 +24,7 @@ public final class DeepwaterHypnotist extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/d/DefiantGreatmaw.java b/Mage.Sets/src/mage/cards/d/DefiantGreatmaw.java index 731df0f5c73..0964068ec37 100644 --- a/Mage.Sets/src/mage/cards/d/DefiantGreatmaw.java +++ b/Mage.Sets/src/mage/cards/d/DefiantGreatmaw.java @@ -17,7 +17,6 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.common.TargetControlledCreaturePermanent; @@ -61,7 +60,7 @@ class DefiantGreatmawTriggeredAbility extends TriggeredAbilityImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } DefiantGreatmawTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/d/DeputyOfAcquittals.java b/Mage.Sets/src/mage/cards/d/DeputyOfAcquittals.java index da6d0e5ba6d..55f2fab37ba 100644 --- a/Mage.Sets/src/mage/cards/d/DeputyOfAcquittals.java +++ b/Mage.Sets/src/mage/cards/d/DeputyOfAcquittals.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; @@ -27,7 +26,7 @@ public final class DeputyOfAcquittals extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature you control"); static { filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public DeputyOfAcquittals(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DeputyOfDetention.java b/Mage.Sets/src/mage/cards/d/DeputyOfDetention.java index d59bc25d3b7..700ecf8eba7 100644 --- a/Mage.Sets/src/mage/cards/d/DeputyOfDetention.java +++ b/Mage.Sets/src/mage/cards/d/DeputyOfDetention.java @@ -17,7 +17,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -36,7 +35,7 @@ public final class DeputyOfDetention extends CardImpl { private static final FilterPermanent filter = new FilterNonlandPermanent("nonland permanent an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public DeputyOfDetention(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DesecrationDemon.java b/Mage.Sets/src/mage/cards/d/DesecrationDemon.java index 36e0878301a..6ae3b03d1a4 100644 --- a/Mage.Sets/src/mage/cards/d/DesecrationDemon.java +++ b/Mage.Sets/src/mage/cards/d/DesecrationDemon.java @@ -15,7 +15,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -72,7 +71,7 @@ class DesecrationDemonEffect extends OneShotEffect { if (opponent != null) { FilterControlledPermanent filter = new FilterControlledPermanent("creature to sacrifice"); filter.add(CardType.CREATURE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); TargetControlledPermanent target = new TargetControlledPermanent(1, 1, filter, false); if (target.canChoose(opponent.getId(), game)) { if (opponent.chooseUse(Outcome.AIDontUseIt, "Sacrifice a creature to tap " + descrationDemon.getLogName() + "and put a +1/+1 counter on it?", source, game)) diff --git a/Mage.Sets/src/mage/cards/d/DesolationAngel.java b/Mage.Sets/src/mage/cards/d/DesolationAngel.java index abed075b441..bd729863f2c 100644 --- a/Mage.Sets/src/mage/cards/d/DesolationAngel.java +++ b/Mage.Sets/src/mage/cards/d/DesolationAngel.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @author Loki @@ -26,7 +25,7 @@ public final class DesolationAngel extends CardImpl { private static final FilterLandPermanent filter2 = new FilterLandPermanent("lands you control"); static { - filter2.add(new ControllerPredicate(TargetController.YOU)); + filter2.add(TargetController.YOU.getControllerPredicate()); } public DesolationAngel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DesolationGiant.java b/Mage.Sets/src/mage/cards/d/DesolationGiant.java index 5ca7943adbd..0e9a89e226b 100644 --- a/Mage.Sets/src/mage/cards/d/DesolationGiant.java +++ b/Mage.Sets/src/mage/cards/d/DesolationGiant.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -29,7 +28,7 @@ public final class DesolationGiant extends CardImpl { static { filter.add(AnotherPredicate.instance); filter2.add(AnotherPredicate.instance); - filter2.add(new ControllerPredicate(TargetController.YOU)); + filter2.add(TargetController.YOU.getControllerPredicate()); } public DesolationGiant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DictateOfErebos.java b/Mage.Sets/src/mage/cards/d/DictateOfErebos.java index 76be6a53e02..bde7fdef024 100644 --- a/Mage.Sets/src/mage/cards/d/DictateOfErebos.java +++ b/Mage.Sets/src/mage/cards/d/DictateOfErebos.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -22,7 +21,7 @@ public final class DictateOfErebos extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public DictateOfErebos(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DinosaurStampede.java b/Mage.Sets/src/mage/cards/d/DinosaurStampede.java index 7bb97493c6f..f10dc95f1a4 100644 --- a/Mage.Sets/src/mage/cards/d/DinosaurStampede.java +++ b/Mage.Sets/src/mage/cards/d/DinosaurStampede.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterAttackingCreature; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -27,7 +26,7 @@ public final class DinosaurStampede extends CardImpl { static { filter2.add(SubType.DINOSAUR.getPredicate()); - filter2.add(new ControllerPredicate(TargetController.YOU)); + filter2.add(TargetController.YOU.getControllerPredicate()); } public DinosaurStampede(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DireFleetNeckbreaker.java b/Mage.Sets/src/mage/cards/d/DireFleetNeckbreaker.java index 728769f0377..a7a101f4ea4 100644 --- a/Mage.Sets/src/mage/cards/d/DireFleetNeckbreaker.java +++ b/Mage.Sets/src/mage/cards/d/DireFleetNeckbreaker.java @@ -10,7 +10,6 @@ import mage.constants.*; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -20,7 +19,7 @@ public final class DireFleetNeckbreaker extends CardImpl { private static final FilterAttackingCreature filterYourAttackingPirates = new FilterAttackingCreature("Attacking Pirates"); static { - filterYourAttackingPirates.add(new ControllerPredicate(TargetController.YOU)); + filterYourAttackingPirates.add(TargetController.YOU.getControllerPredicate()); filterYourAttackingPirates.add(SubType.PIRATE.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/d/DireFleetPoisoner.java b/Mage.Sets/src/mage/cards/d/DireFleetPoisoner.java index f9199a211b6..5a5309d9621 100644 --- a/Mage.Sets/src/mage/cards/d/DireFleetPoisoner.java +++ b/Mage.Sets/src/mage/cards/d/DireFleetPoisoner.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AttackingPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -29,7 +28,7 @@ public final class DireFleetPoisoner extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(SubType.PIRATE, "attacking Pirate"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AttackingPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/d/DisasterRadius.java b/Mage.Sets/src/mage/cards/d/DisasterRadius.java index 69df9567104..bdcc37c2207 100644 --- a/Mage.Sets/src/mage/cards/d/DisasterRadius.java +++ b/Mage.Sets/src/mage/cards/d/DisasterRadius.java @@ -12,7 +12,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCardInHand; @@ -50,7 +49,7 @@ class DisasterRadiusEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public DisasterRadiusEffect() { diff --git a/Mage.Sets/src/mage/cards/d/DismissIntoDream.java b/Mage.Sets/src/mage/cards/d/DismissIntoDream.java index 6279d0a6a8e..16a2addbe15 100644 --- a/Mage.Sets/src/mage/cards/d/DismissIntoDream.java +++ b/Mage.Sets/src/mage/cards/d/DismissIntoDream.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -44,7 +43,7 @@ class DismissIntoDreamEffect extends ContinuousEffectImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } DismissIntoDreamEffect() { diff --git a/Mage.Sets/src/mage/cards/d/DivineLight.java b/Mage.Sets/src/mage/cards/d/DivineLight.java index b74a0fd877a..058c465b81f 100644 --- a/Mage.Sets/src/mage/cards/d/DivineLight.java +++ b/Mage.Sets/src/mage/cards/d/DivineLight.java @@ -9,7 +9,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -20,7 +19,7 @@ public final class DivineLight extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public DivineLight(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DocentOfPerfection.java b/Mage.Sets/src/mage/cards/d/DocentOfPerfection.java index 9b82adc7bc6..be67eb1c645 100644 --- a/Mage.Sets/src/mage/cards/d/DocentOfPerfection.java +++ b/Mage.Sets/src/mage/cards/d/DocentOfPerfection.java @@ -21,7 +21,6 @@ import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.token.HumanWizardToken; import mage.players.Player; @@ -77,7 +76,7 @@ class DocentOfPerfectionEffect extends OneShotEffect { static { filter.add(SubType.WIZARD.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public DocentOfPerfectionEffect() { diff --git a/Mage.Sets/src/mage/cards/d/Dogpile.java b/Mage.Sets/src/mage/cards/d/Dogpile.java index 4be001a52db..49eea83f3f2 100644 --- a/Mage.Sets/src/mage/cards/d/Dogpile.java +++ b/Mage.Sets/src/mage/cards/d/Dogpile.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetAnyTarget; /** @@ -21,7 +20,7 @@ public final class Dogpile extends CardImpl { private static final FilterAttackingCreature filter = new FilterAttackingCreature("attacking creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public Dogpile(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DomriAnarchOfBolas.java b/Mage.Sets/src/mage/cards/d/DomriAnarchOfBolas.java index e6fda3bc43f..c7d33f04a59 100644 --- a/Mage.Sets/src/mage/cards/d/DomriAnarchOfBolas.java +++ b/Mage.Sets/src/mage/cards/d/DomriAnarchOfBolas.java @@ -15,7 +15,6 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetPermanent; @@ -32,7 +31,7 @@ public final class DomriAnarchOfBolas extends CardImpl { = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public DomriAnarchOfBolas(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DomrisAmbush.java b/Mage.Sets/src/mage/cards/d/DomrisAmbush.java index ba5012fd40b..aa6ece0e257 100644 --- a/Mage.Sets/src/mage/cards/d/DomrisAmbush.java +++ b/Mage.Sets/src/mage/cards/d/DomrisAmbush.java @@ -11,7 +11,6 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -28,7 +27,7 @@ public final class DomrisAmbush extends CardImpl { = new FilterCreatureOrPlaneswalkerPermanent("creature or planeswalker you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public DomrisAmbush(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DongZhouTheTyrant.java b/Mage.Sets/src/mage/cards/d/DongZhouTheTyrant.java index 07a3e2c016e..37ea103bab9 100644 --- a/Mage.Sets/src/mage/cards/d/DongZhouTheTyrant.java +++ b/Mage.Sets/src/mage/cards/d/DongZhouTheTyrant.java @@ -14,7 +14,6 @@ import mage.constants.Outcome; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -29,7 +28,7 @@ public final class DongZhouTheTyrant extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public DongZhouTheTyrant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DoomedArtisan.java b/Mage.Sets/src/mage/cards/d/DoomedArtisan.java index ee11687ff52..1e04193b114 100644 --- a/Mage.Sets/src/mage/cards/d/DoomedArtisan.java +++ b/Mage.Sets/src/mage/cards/d/DoomedArtisan.java @@ -12,7 +12,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.DoomedArtisanToken; import java.util.UUID; @@ -26,7 +25,7 @@ public final class DoomedArtisan extends CardImpl { = new FilterCreaturePermanent(SubType.SCULPTURE, "Sculptures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public DoomedArtisan(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DoomwakeGiant.java b/Mage.Sets/src/mage/cards/d/DoomwakeGiant.java index fcaf2a9d8cc..5e131505ea5 100644 --- a/Mage.Sets/src/mage/cards/d/DoomwakeGiant.java +++ b/Mage.Sets/src/mage/cards/d/DoomwakeGiant.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -23,7 +22,7 @@ public final class DoomwakeGiant extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public DoomwakeGiant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/Downsize.java b/Mage.Sets/src/mage/cards/d/Downsize.java index 65c56d65b8c..be1526a1644 100644 --- a/Mage.Sets/src/mage/cards/d/Downsize.java +++ b/Mage.Sets/src/mage/cards/d/Downsize.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class Downsize extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public Downsize(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DragonloftIdol.java b/Mage.Sets/src/mage/cards/d/DragonloftIdol.java index 7cad3c0ac76..22852992369 100644 --- a/Mage.Sets/src/mage/cards/d/DragonloftIdol.java +++ b/Mage.Sets/src/mage/cards/d/DragonloftIdol.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.permanent.ControllerPredicate; /** * @@ -27,7 +26,7 @@ public final class DragonloftIdol extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Dragon"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.DRAGON.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/d/DragonlordAtarka.java b/Mage.Sets/src/mage/cards/d/DragonlordAtarka.java index 19c34c60b8b..68e4876378d 100644 --- a/Mage.Sets/src/mage/cards/d/DragonlordAtarka.java +++ b/Mage.Sets/src/mage/cards/d/DragonlordAtarka.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreatureOrPlaneswalkerAmount; /** @@ -27,7 +26,7 @@ public final class DragonlordAtarka extends CardImpl { private static final FilterCreatureOrPlaneswalkerPermanent filter = new FilterCreatureOrPlaneswalkerPermanent("target creatures and/or planeswalkers your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public DragonlordAtarka(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DragonscaleGeneral.java b/Mage.Sets/src/mage/cards/d/DragonscaleGeneral.java index ed089609426..9b41fa2be59 100644 --- a/Mage.Sets/src/mage/cards/d/DragonscaleGeneral.java +++ b/Mage.Sets/src/mage/cards/d/DragonscaleGeneral.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; /** @@ -25,7 +24,7 @@ public final class DragonscaleGeneral extends CardImpl { static { filter.add(TappedPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public DragonscaleGeneral(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DramaticReversal.java b/Mage.Sets/src/mage/cards/d/DramaticReversal.java index a8d990a82da..14844626c22 100644 --- a/Mage.Sets/src/mage/cards/d/DramaticReversal.java +++ b/Mage.Sets/src/mage/cards/d/DramaticReversal.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -19,7 +18,7 @@ public final class DramaticReversal extends CardImpl { private static final FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanents"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public DramaticReversal(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DranaLiberatorOfMalakir.java b/Mage.Sets/src/mage/cards/d/DranaLiberatorOfMalakir.java index 0c1fd168d2f..baa4800fc58 100644 --- a/Mage.Sets/src/mage/cards/d/DranaLiberatorOfMalakir.java +++ b/Mage.Sets/src/mage/cards/d/DranaLiberatorOfMalakir.java @@ -15,7 +15,6 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -26,7 +25,7 @@ public final class DranaLiberatorOfMalakir extends CardImpl { private static final FilterAttackingCreature filter = new FilterAttackingCreature("each attacking creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public DranaLiberatorOfMalakir(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DreadCacodemon.java b/Mage.Sets/src/mage/cards/d/DreadCacodemon.java index 2df82acf881..cb2b37606c2 100644 --- a/Mage.Sets/src/mage/cards/d/DreadCacodemon.java +++ b/Mage.Sets/src/mage/cards/d/DreadCacodemon.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.watchers.common.CastFromHandWatcher; /** @@ -26,12 +25,12 @@ public final class DreadCacodemon extends CardImpl { private static final FilterCreaturePermanent opponentsCreatures = new FilterCreaturePermanent("creatures your opponents control"); static { - opponentsCreatures.add(new ControllerPredicate(TargetController.OPPONENT)); + opponentsCreatures.add(TargetController.OPPONENT.getControllerPredicate()); } private static final FilterCreaturePermanent otherCreaturesYouControl = new FilterCreaturePermanent("other creatures you control"); static { - otherCreaturesYouControl.add(new ControllerPredicate(TargetController.YOU)); + otherCreaturesYouControl.add(TargetController.YOU.getControllerPredicate()); otherCreaturesYouControl.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/d/DreadCharge.java b/Mage.Sets/src/mage/cards/d/DreadCharge.java index 48da5a1b717..db6e74ed04f 100644 --- a/Mage.Sets/src/mage/cards/d/DreadCharge.java +++ b/Mage.Sets/src/mage/cards/d/DreadCharge.java @@ -26,7 +26,7 @@ public final class DreadCharge extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.BLACK)); filter2.add(Predicates.not(new ColorPredicate(ObjectColor.BLACK))); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public DreadCharge(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DreadhordeInvasion.java b/Mage.Sets/src/mage/cards/d/DreadhordeInvasion.java index 98092d6deb4..c34803e2448 100644 --- a/Mage.Sets/src/mage/cards/d/DreadhordeInvasion.java +++ b/Mage.Sets/src/mage/cards/d/DreadhordeInvasion.java @@ -15,7 +15,6 @@ import mage.filter.predicate.permanent.TokenPredicate; import java.util.UUID; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @author TheElk801 @@ -28,7 +27,7 @@ public final class DreadhordeInvasion extends CardImpl { static { filter.add(new PowerPredicate(ComparisonType.MORE_THAN, 5)); filter.add(TokenPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public DreadhordeInvasion(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/Dreadwaters.java b/Mage.Sets/src/mage/cards/d/Dreadwaters.java index b3bb9139300..4e930f7cbe0 100644 --- a/Mage.Sets/src/mage/cards/d/Dreadwaters.java +++ b/Mage.Sets/src/mage/cards/d/Dreadwaters.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPlayer; /** @@ -22,7 +21,7 @@ public final class Dreadwaters extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("lands you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public Dreadwaters(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DreamEater.java b/Mage.Sets/src/mage/cards/d/DreamEater.java index 9c809452973..de2fe374169 100644 --- a/Mage.Sets/src/mage/cards/d/DreamEater.java +++ b/Mage.Sets/src/mage/cards/d/DreamEater.java @@ -19,7 +19,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.TargetPermanent; @@ -92,7 +91,7 @@ class DreamEaterReflexiveTriggeredAbility extends DelayedTriggeredAbility { = new FilterNonlandPermanent("nonland permanent an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public DreamEaterReflexiveTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/d/DreamcallerSiren.java b/Mage.Sets/src/mage/cards/d/DreamcallerSiren.java index 9d1ee445831..d4ae5f8531f 100644 --- a/Mage.Sets/src/mage/cards/d/DreamcallerSiren.java +++ b/Mage.Sets/src/mage/cards/d/DreamcallerSiren.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetNonlandPermanent; /** @@ -32,7 +31,7 @@ public final class DreamcallerSiren extends CardImpl { static { filter.add(SubType.PIRATE.getPredicate()); filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public DreamcallerSiren(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DriftOfTheDead.java b/Mage.Sets/src/mage/cards/d/DriftOfTheDead.java index 6ef0de4872a..3c15fe42066 100644 --- a/Mage.Sets/src/mage/cards/d/DriftOfTheDead.java +++ b/Mage.Sets/src/mage/cards/d/DriftOfTheDead.java @@ -16,7 +16,6 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -29,7 +28,7 @@ public final class DriftOfTheDead extends CardImpl { static { filter.add(SuperType.SNOW.getPredicate()); filter.add(CardType.LAND.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public DriftOfTheDead(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DromokasCommand.java b/Mage.Sets/src/mage/cards/d/DromokasCommand.java index 9774d414088..cfe17d2161e 100644 --- a/Mage.Sets/src/mage/cards/d/DromokasCommand.java +++ b/Mage.Sets/src/mage/cards/d/DromokasCommand.java @@ -17,7 +17,6 @@ import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.common.FilterInstantOrSorcerySpell; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPlayer; import mage.target.TargetSpell; import mage.target.common.TargetControlledCreaturePermanent; @@ -34,7 +33,7 @@ public final class DromokasCommand extends CardImpl { private static final FilterCreaturePermanent filterUncontrolledCreature = new FilterCreaturePermanent("creature you don't control"); static { - filterUncontrolledCreature.add(new ControllerPredicate(TargetController.NOT_YOU)); + filterUncontrolledCreature.add(TargetController.NOT_YOU.getControllerPredicate()); } public DromokasCommand(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DualCasting.java b/Mage.Sets/src/mage/cards/d/DualCasting.java index e9c0b7cdcbc..3cd0703593b 100644 --- a/Mage.Sets/src/mage/cards/d/DualCasting.java +++ b/Mage.Sets/src/mage/cards/d/DualCasting.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.TargetSpell; import mage.target.common.TargetCreaturePermanent; @@ -32,7 +31,7 @@ public final class DualCasting extends CardImpl { filter.add(Predicates.or( CardType.INSTANT.getPredicate(), CardType.SORCERY.getPredicate())); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public DualCasting(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DungeonGeists.java b/Mage.Sets/src/mage/cards/d/DungeonGeists.java index ff105f4b1ee..34ae3ae5269 100644 --- a/Mage.Sets/src/mage/cards/d/DungeonGeists.java +++ b/Mage.Sets/src/mage/cards/d/DungeonGeists.java @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -31,7 +30,7 @@ public final class DungeonGeists extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public DungeonGeists(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EarlOfSquirrel.java b/Mage.Sets/src/mage/cards/e/EarlOfSquirrel.java index 9e2a260423d..1e9b1da5c9f 100644 --- a/Mage.Sets/src/mage/cards/e/EarlOfSquirrel.java +++ b/Mage.Sets/src/mage/cards/e/EarlOfSquirrel.java @@ -32,7 +32,7 @@ public final class EarlOfSquirrel extends CardImpl { static { filter.add(TokenPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter2.add(SubType.SQUIRREL.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/e/EarthServant.java b/Mage.Sets/src/mage/cards/e/EarthServant.java index 5682c411d54..b32fac42818 100644 --- a/Mage.Sets/src/mage/cards/e/EarthServant.java +++ b/Mage.Sets/src/mage/cards/e/EarthServant.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -23,7 +22,7 @@ public final class EarthServant extends CardImpl { static { filter.add(SubType.MOUNTAIN.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public EarthServant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EbonyHorse.java b/Mage.Sets/src/mage/cards/e/EbonyHorse.java index 610dd3291cf..748c57018b5 100644 --- a/Mage.Sets/src/mage/cards/e/EbonyHorse.java +++ b/Mage.Sets/src/mage/cards/e/EbonyHorse.java @@ -18,7 +18,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AttackingPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -29,7 +28,7 @@ public final class EbonyHorse extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("attacking creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AttackingPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/e/EchoBaseCommando.java b/Mage.Sets/src/mage/cards/e/EchoBaseCommando.java index 7a32c00af80..ba2fc05b2e4 100644 --- a/Mage.Sets/src/mage/cards/e/EchoBaseCommando.java +++ b/Mage.Sets/src/mage/cards/e/EchoBaseCommando.java @@ -14,7 +14,6 @@ import mage.constants.*; import mage.filter.Filter; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.util.CardUtil; @@ -62,7 +61,7 @@ class EchoBaseCommandoEffect extends CostModificationEffectImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public EchoBaseCommandoEffect() { diff --git a/Mage.Sets/src/mage/cards/e/Electrickery.java b/Mage.Sets/src/mage/cards/e/Electrickery.java index 20d9cff4319..6ba7ccd4800 100644 --- a/Mage.Sets/src/mage/cards/e/Electrickery.java +++ b/Mage.Sets/src/mage/cards/e/Electrickery.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -23,7 +22,7 @@ public final class Electrickery extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public Electrickery(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EmissaryOfHope.java b/Mage.Sets/src/mage/cards/e/EmissaryOfHope.java index a7866a6f6e8..97278ec80d5 100644 --- a/Mage.Sets/src/mage/cards/e/EmissaryOfHope.java +++ b/Mage.Sets/src/mage/cards/e/EmissaryOfHope.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.players.Player; @@ -51,7 +50,7 @@ class EmissaryOfHopeEffect extends OneShotEffect { static { filter.add(CardType.ARTIFACT.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } EmissaryOfHopeEffect() { diff --git a/Mage.Sets/src/mage/cards/e/EmmaraTandris.java b/Mage.Sets/src/mage/cards/e/EmmaraTandris.java index fff826969d5..cfa4fc66bf5 100644 --- a/Mage.Sets/src/mage/cards/e/EmmaraTandris.java +++ b/Mage.Sets/src/mage/cards/e/EmmaraTandris.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import java.util.UUID; @@ -22,7 +21,7 @@ public final class EmmaraTandris extends CardImpl { static { filter.add(TokenPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public EmmaraTandris(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EmpyreanEagle.java b/Mage.Sets/src/mage/cards/e/EmpyreanEagle.java index 525ecaf2564..24147c0e55f 100644 --- a/Mage.Sets/src/mage/cards/e/EmpyreanEagle.java +++ b/Mage.Sets/src/mage/cards/e/EmpyreanEagle.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -26,7 +25,7 @@ public final class EmpyreanEagle extends CardImpl { static { filter.add(new AbilityPredicate(FlyingAbility.class)); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public EmpyreanEagle(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/Endure.java b/Mage.Sets/src/mage/cards/e/Endure.java index 2ef0a87d1fa..e6d952e1af9 100644 --- a/Mage.Sets/src/mage/cards/e/Endure.java +++ b/Mage.Sets/src/mage/cards/e/Endure.java @@ -9,7 +9,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePlayerOrPlaneswalker; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -20,7 +19,7 @@ public final class Endure extends CardImpl { private static final FilterCreaturePlayerOrPlaneswalker filter = new FilterCreaturePlayerOrPlaneswalker("you and permanents you control"); static { - filter.getCreatureFilter().add(new ControllerPredicate(TargetController.YOU)); + filter.getCreatureFilter().add(TargetController.YOU.getControllerPredicate()); filter.getPlayerFilter().add(TargetController.YOU.getPlayerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/e/EntanglingTrap.java b/Mage.Sets/src/mage/cards/e/EntanglingTrap.java index da1155bd0db..a80629f9699 100644 --- a/Mage.Sets/src/mage/cards/e/EntanglingTrap.java +++ b/Mage.Sets/src/mage/cards/e/EntanglingTrap.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -30,7 +29,7 @@ public final class EntanglingTrap extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public EntanglingTrap(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EnthrallingVictor.java b/Mage.Sets/src/mage/cards/e/EnthrallingVictor.java index baeabbc3220..31bbbf2e00d 100644 --- a/Mage.Sets/src/mage/cards/e/EnthrallingVictor.java +++ b/Mage.Sets/src/mage/cards/e/EnthrallingVictor.java @@ -19,7 +19,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -33,7 +32,7 @@ public final class EnthrallingVictor extends CardImpl { static { filter.add(new PowerPredicate(ComparisonType.FEWER_THAN, 3)); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public EnthrallingVictor(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EpicConfrontation.java b/Mage.Sets/src/mage/cards/e/EpicConfrontation.java index 105932a2975..0dcd2c6ff86 100644 --- a/Mage.Sets/src/mage/cards/e/EpicConfrontation.java +++ b/Mage.Sets/src/mage/cards/e/EpicConfrontation.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -25,7 +24,7 @@ public final class EpicConfrontation extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public EpicConfrontation(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/ErebossTitan.java b/Mage.Sets/src/mage/cards/e/ErebossTitan.java index d15a436bb83..ce5eba67951 100644 --- a/Mage.Sets/src/mage/cards/e/ErebossTitan.java +++ b/Mage.Sets/src/mage/cards/e/ErebossTitan.java @@ -22,7 +22,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -37,7 +36,7 @@ public final class ErebossTitan extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ErebossTitan(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/ErhnamDjinn.java b/Mage.Sets/src/mage/cards/e/ErhnamDjinn.java index ff637e20be1..4959f6d5b20 100644 --- a/Mage.Sets/src/mage/cards/e/ErhnamDjinn.java +++ b/Mage.Sets/src/mage/cards/e/ErhnamDjinn.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -25,7 +24,7 @@ public final class ErhnamDjinn extends CardImpl { static { filter.add(Predicates.not(SubType.WALL.getPredicate())); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ErhnamDjinn(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EscapeRoutes.java b/Mage.Sets/src/mage/cards/e/EscapeRoutes.java index 2327acde7c5..4899ef7089b 100644 --- a/Mage.Sets/src/mage/cards/e/EscapeRoutes.java +++ b/Mage.Sets/src/mage/cards/e/EscapeRoutes.java @@ -15,7 +15,6 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -28,7 +27,7 @@ public final class EscapeRoutes extends CardImpl { static { filter.add(Predicates.or(new ColorPredicate(ObjectColor.WHITE), new ColorPredicate(ObjectColor.BLACK))); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public EscapeRoutes(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EtchingsOfTheChosen.java b/Mage.Sets/src/mage/cards/e/EtchingsOfTheChosen.java index 84b2a3babf0..f57521b7af8 100644 --- a/Mage.Sets/src/mage/cards/e/EtchingsOfTheChosen.java +++ b/Mage.Sets/src/mage/cards/e/EtchingsOfTheChosen.java @@ -20,7 +20,6 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ChosenSubtypePredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledPermanent; @@ -38,7 +37,7 @@ public final class EtchingsOfTheChosen extends CardImpl { static { filter.add(ChosenSubtypePredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter2.add(ChosenSubtypePredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/e/EternalThirst.java b/Mage.Sets/src/mage/cards/e/EternalThirst.java index ef68fa4ab95..93d5c8582c7 100644 --- a/Mage.Sets/src/mage/cards/e/EternalThirst.java +++ b/Mage.Sets/src/mage/cards/e/EternalThirst.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -28,7 +27,7 @@ public final class EternalThirst extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public EternalThirst(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EtherealArmor.java b/Mage.Sets/src/mage/cards/e/EtherealArmor.java index 64f42f39456..9e79307d178 100644 --- a/Mage.Sets/src/mage/cards/e/EtherealArmor.java +++ b/Mage.Sets/src/mage/cards/e/EtherealArmor.java @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterEnchantmentPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -28,7 +27,7 @@ public final class EtherealArmor extends CardImpl { private static final FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent("enchantment you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public EtherealArmor (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java b/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java index 9d0b489c1aa..a436c80649b 100644 --- a/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java +++ b/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -26,7 +25,7 @@ public final class EvilEyeOfOrmsByGore extends CardImpl { static { cantBeBlockedByFilter.add(Predicates.not(SubType.WALL.getPredicate())); cantAttackFilter.add(Predicates.not((SubType.EYE.getPredicate()))); - cantAttackFilter.add(new ControllerPredicate(TargetController.YOU)); + cantAttackFilter.add(TargetController.YOU.getControllerPredicate()); } public EvilEyeOfOrmsByGore(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java b/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java index b7166996429..1082247a2c4 100644 --- a/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java +++ b/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -24,7 +23,7 @@ public final class EvilEyeOfUrborg extends CardImpl { static { cantAttackFilter.add(Predicates.not((SubType.EYE.getPredicate()))); - cantAttackFilter.add(new ControllerPredicate(TargetController.YOU)); + cantAttackFilter.add(TargetController.YOU.getControllerPredicate()); } public EvilEyeOfUrborg(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EvolutionaryEscalation.java b/Mage.Sets/src/mage/cards/e/EvolutionaryEscalation.java index 418c224bd6b..34027dda76d 100644 --- a/Mage.Sets/src/mage/cards/e/EvolutionaryEscalation.java +++ b/Mage.Sets/src/mage/cards/e/EvolutionaryEscalation.java @@ -13,7 +13,6 @@ import mage.constants.TargetController; import mage.counters.Counter; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.Target; @@ -28,7 +27,7 @@ public final class EvolutionaryEscalation extends CardImpl { private static final FilterCreaturePermanent filterOpponentCreature = new FilterCreaturePermanent("creature an opponent controls"); static { - filterOpponentCreature.add(new ControllerPredicate(TargetController.OPPONENT)); + filterOpponentCreature.add(TargetController.OPPONENT.getControllerPredicate()); } public EvolutionaryEscalation(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java b/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java index cd330ce4b50..a97f1e67e26 100644 --- a/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java +++ b/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java @@ -14,7 +14,6 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; /** @@ -26,7 +25,7 @@ public final class ExavaRakdosBloodWitch extends CardImpl { private static final FilterPermanent filter = new FilterPermanent(); static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(new CounterPredicate(CounterType.P1P1)); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java b/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java index 39767e1caeb..23639b23b66 100644 --- a/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java +++ b/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java @@ -17,7 +17,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ManaEvent; @@ -36,7 +35,7 @@ public final class ExtraplanarLens extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("land you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public ExtraplanarLens(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EyeblightAssassin.java b/Mage.Sets/src/mage/cards/e/EyeblightAssassin.java index c97b2511d90..ca12bc4f776 100644 --- a/Mage.Sets/src/mage/cards/e/EyeblightAssassin.java +++ b/Mage.Sets/src/mage/cards/e/EyeblightAssassin.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -25,7 +24,7 @@ public final class EyeblightAssassin extends CardImpl { private static final FilterCreaturePermanent filterOpponentCreature = new FilterCreaturePermanent("creature an opponent controls"); static { - filterOpponentCreature.add(new ControllerPredicate(TargetController.OPPONENT)); + filterOpponentCreature.add(TargetController.OPPONENT.getControllerPredicate()); } public EyeblightAssassin(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EzurisPredation.java b/Mage.Sets/src/mage/cards/e/EzurisPredation.java index 03c508f1b73..ef1c18b4c17 100644 --- a/Mage.Sets/src/mage/cards/e/EzurisPredation.java +++ b/Mage.Sets/src/mage/cards/e/EzurisPredation.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.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.BeastToken2; @@ -74,7 +73,7 @@ class EzurisPredationEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { FilterCreaturePermanent filterCreature = new FilterCreaturePermanent(); - filterCreature.add(new ControllerPredicate(TargetController.OPPONENT)); + filterCreature.add(TargetController.OPPONENT.getControllerPredicate()); List creaturesOfOpponents = game.getBattlefield().getActivePermanents(filterCreature, source.getControllerId(), source.getSourceId(), game); if (!creaturesOfOpponents.isEmpty()) { CreateTokenEffect effect = new CreateTokenEffect(new BeastToken2(), creaturesOfOpponents.size()); diff --git a/Mage.Sets/src/mage/cards/f/FaerieArtisans.java b/Mage.Sets/src/mage/cards/f/FaerieArtisans.java index 5d1e4899e63..ca5a0e01844 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieArtisans.java +++ b/Mage.Sets/src/mage/cards/f/FaerieArtisans.java @@ -15,7 +15,6 @@ import mage.cards.CardsImpl; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -32,7 +31,7 @@ public final class FaerieArtisans extends CardImpl { static { filterNontoken.add(Predicates.not(TokenPredicate.instance)); - filterNontoken.add(new ControllerPredicate(TargetController.OPPONENT)); + filterNontoken.add(TargetController.OPPONENT.getControllerPredicate()); } public FaerieArtisans(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FaerieMiscreant.java b/Mage.Sets/src/mage/cards/f/FaerieMiscreant.java index a049ddace90..9e1217ec232 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieMiscreant.java +++ b/Mage.Sets/src/mage/cards/f/FaerieMiscreant.java @@ -15,7 +15,6 @@ import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -29,7 +28,7 @@ public final class FaerieMiscreant extends CardImpl { static { filter.add(new NamePredicate("Faerie Miscreant")); filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } private static final Condition condition = new PermanentsOnTheBattlefieldCondition(filter); diff --git a/Mage.Sets/src/mage/cards/f/FairgroundsWarden.java b/Mage.Sets/src/mage/cards/f/FairgroundsWarden.java index 03ab1b1fd99..ff0a53e4d7f 100644 --- a/Mage.Sets/src/mage/cards/f/FairgroundsWarden.java +++ b/Mage.Sets/src/mage/cards/f/FairgroundsWarden.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -31,7 +30,7 @@ public final class FairgroundsWarden extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public FairgroundsWarden(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FaithUnbroken.java b/Mage.Sets/src/mage/cards/f/FaithUnbroken.java index 27071d739f6..430c0639bf7 100644 --- a/Mage.Sets/src/mage/cards/f/FaithUnbroken.java +++ b/Mage.Sets/src/mage/cards/f/FaithUnbroken.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.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -33,7 +32,7 @@ public final class FaithUnbroken extends CardImpl { private static final FilterCreaturePermanent filterTarget = new FilterCreaturePermanent("creature an opponent controls"); static { - filterTarget.add(new ControllerPredicate(TargetController.OPPONENT)); + filterTarget.add(TargetController.OPPONENT.getControllerPredicate()); } public FaithUnbroken(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FathomFleetCutthroat.java b/Mage.Sets/src/mage/cards/f/FathomFleetCutthroat.java index c8d92a54dd6..42cc110b356 100644 --- a/Mage.Sets/src/mage/cards/f/FathomFleetCutthroat.java +++ b/Mage.Sets/src/mage/cards/f/FathomFleetCutthroat.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.WasDealtDamageThisTurnPredicate; import mage.target.common.TargetCreaturePermanent; @@ -26,7 +25,7 @@ public final class FathomFleetCutthroat extends CardImpl { static { filter.add(new WasDealtDamageThisTurnPredicate()); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public FathomFleetCutthroat(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FencersMagemark.java b/Mage.Sets/src/mage/cards/f/FencersMagemark.java index 60aad9afb0b..6d144f01926 100644 --- a/Mage.Sets/src/mage/cards/f/FencersMagemark.java +++ b/Mage.Sets/src/mage/cards/f/FencersMagemark.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.EnchantedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -28,7 +27,7 @@ public final class FencersMagemark extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control that are enchanted"); static { filter.add(EnchantedPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public FencersMagemark(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FerocityOfTheWilds.java b/Mage.Sets/src/mage/cards/f/FerocityOfTheWilds.java index 0a0c9a3212c..ecd0df39202 100644 --- a/Mage.Sets/src/mage/cards/f/FerocityOfTheWilds.java +++ b/Mage.Sets/src/mage/cards/f/FerocityOfTheWilds.java @@ -14,7 +14,6 @@ import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.AttackingPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -28,7 +27,7 @@ public final class FerocityOfTheWilds extends CardImpl { static { filter.add(AttackingPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.not(SubType.HUMAN.getPredicate())); } diff --git a/Mage.Sets/src/mage/cards/f/FesteringNewt.java b/Mage.Sets/src/mage/cards/f/FesteringNewt.java index c6e0e69a7ed..d0219fe32cf 100644 --- a/Mage.Sets/src/mage/cards/f/FesteringNewt.java +++ b/Mage.Sets/src/mage/cards/f/FesteringNewt.java @@ -18,7 +18,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -30,7 +29,7 @@ public final class FesteringNewt extends CardImpl { private static final FilterCreaturePermanent filterCreature = new FilterCreaturePermanent("creature an opponent controls"); private static final FilterCreaturePermanent filterBogbrewWitch = new FilterCreaturePermanent(); static { - filterCreature.add(new ControllerPredicate(TargetController.OPPONENT)); + filterCreature.add(TargetController.OPPONENT.getControllerPredicate()); filterBogbrewWitch.add(new NamePredicate("Bogbrew Witch")); } public FesteringNewt(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FieldOfRuin.java b/Mage.Sets/src/mage/cards/f/FieldOfRuin.java index c9422ac6e7e..e9fcd99db26 100644 --- a/Mage.Sets/src/mage/cards/f/FieldOfRuin.java +++ b/Mage.Sets/src/mage/cards/f/FieldOfRuin.java @@ -21,7 +21,6 @@ import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; @@ -36,7 +35,7 @@ public final class FieldOfRuin extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("nonbasic land an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filter.add(Predicates.not(SuperType.BASIC.getPredicate())); } diff --git a/Mage.Sets/src/mage/cards/f/FieldOfSouls.java b/Mage.Sets/src/mage/cards/f/FieldOfSouls.java index 682ac54ff26..1503fabb024 100644 --- a/Mage.Sets/src/mage/cards/f/FieldOfSouls.java +++ b/Mage.Sets/src/mage/cards/f/FieldOfSouls.java @@ -9,7 +9,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.SpiritWhiteToken; @@ -22,7 +21,7 @@ public final class FieldOfSouls extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a nontoken creature"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.not(TokenPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/f/FinalIteration.java b/Mage.Sets/src/mage/cards/f/FinalIteration.java index 418f4386e14..7ac94db8cfb 100644 --- a/Mage.Sets/src/mage/cards/f/FinalIteration.java +++ b/Mage.Sets/src/mage/cards/f/FinalIteration.java @@ -17,7 +17,6 @@ import mage.constants.*; import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.HumanWizardToken; /** @@ -31,7 +30,7 @@ public final class FinalIteration extends CardImpl { static { filter.add(SubType.WIZARD.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filterSpell.add(Predicates.or( CardType.INSTANT.getPredicate(), CardType.SORCERY.getPredicate())); diff --git a/Mage.Sets/src/mage/cards/f/Finn.java b/Mage.Sets/src/mage/cards/f/Finn.java index aee02c573a4..993d047597d 100644 --- a/Mage.Sets/src/mage/cards/f/Finn.java +++ b/Mage.Sets/src/mage/cards/f/Finn.java @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; /** @@ -22,7 +21,7 @@ public final class Finn extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("{this} or another nontoken creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.not(TokenPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java b/Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java index d05f552257e..89bfb994dcf 100644 --- a/Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java +++ b/Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java @@ -16,7 +16,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -28,7 +27,7 @@ public final class FiresOfYavimaya extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public FiresOfYavimaya(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/Flutterfox.java b/Mage.Sets/src/mage/cards/f/Flutterfox.java index aaf6b55a8f2..7e463eac916 100644 --- a/Mage.Sets/src/mage/cards/f/Flutterfox.java +++ b/Mage.Sets/src/mage/cards/f/Flutterfox.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -27,7 +26,7 @@ public final class Flutterfox extends CardImpl { private static final FilterPermanent filter = new FilterArtifactOrEnchantmentPermanent(); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } private static final Condition condition = new PermanentsOnTheBattlefieldCondition(filter); diff --git a/Mage.Sets/src/mage/cards/f/FoeRazerRegent.java b/Mage.Sets/src/mage/cards/f/FoeRazerRegent.java index b66dd9c48a5..efad58f9748 100644 --- a/Mage.Sets/src/mage/cards/f/FoeRazerRegent.java +++ b/Mage.Sets/src/mage/cards/f/FoeRazerRegent.java @@ -20,7 +20,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -37,7 +36,7 @@ public final class FoeRazerRegent extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public FoeRazerRegent(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/Fogwalker.java b/Mage.Sets/src/mage/cards/f/Fogwalker.java index be35d317527..218a82432de 100644 --- a/Mage.Sets/src/mage/cards/f/Fogwalker.java +++ b/Mage.Sets/src/mage/cards/f/Fogwalker.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class Fogwalker extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public Fogwalker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/ForceStasis.java b/Mage.Sets/src/mage/cards/f/ForceStasis.java index 847b6f0fea7..7d2edc9f1a2 100644 --- a/Mage.Sets/src/mage/cards/f/ForceStasis.java +++ b/Mage.Sets/src/mage/cards/f/ForceStasis.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.FilterSpell; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetSpell; import mage.target.common.TargetCreaturePermanent; @@ -24,7 +23,7 @@ public final class ForceStasis extends CardImpl { private static final FilterSpell filter = new FilterSpell("instant or sorcery spell you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); filter.add(CardType.INSTANT.getPredicate()); filter.add(CardType.SORCERY.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/f/ForerunnerOfTheCoalition.java b/Mage.Sets/src/mage/cards/f/ForerunnerOfTheCoalition.java index 1cd38f8a524..a1c650111e7 100644 --- a/Mage.Sets/src/mage/cards/f/ForerunnerOfTheCoalition.java +++ b/Mage.Sets/src/mage/cards/f/ForerunnerOfTheCoalition.java @@ -14,7 +14,6 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterBySubtypeCard; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCardInLibrary; /** @@ -27,7 +26,7 @@ public final class ForerunnerOfTheCoalition extends CardImpl { static { filterAnotherPirate.add(AnotherPredicate.instance); - filterAnotherPirate.add(new ControllerPredicate(TargetController.YOU)); + filterAnotherPirate.add(TargetController.YOU.getControllerPredicate()); } public ForerunnerOfTheCoalition(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/ForerunnerOfTheEmpire.java b/Mage.Sets/src/mage/cards/f/ForerunnerOfTheEmpire.java index a33e5bfc1bb..f05d2173d20 100644 --- a/Mage.Sets/src/mage/cards/f/ForerunnerOfTheEmpire.java +++ b/Mage.Sets/src/mage/cards/f/ForerunnerOfTheEmpire.java @@ -15,7 +15,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterBySubtypeCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCardInLibrary; import java.util.UUID; @@ -28,7 +27,7 @@ public final class ForerunnerOfTheEmpire extends CardImpl { private static final FilterCreaturePermanent filterAnyDinosaur = new FilterCreaturePermanent(SubType.DINOSAUR, SubType.DINOSAUR.toString()); static { - filterAnyDinosaur.add(new ControllerPredicate(TargetController.YOU)); + filterAnyDinosaur.add(TargetController.YOU.getControllerPredicate()); } public ForerunnerOfTheEmpire(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/ForerunnerOfTheHeralds.java b/Mage.Sets/src/mage/cards/f/ForerunnerOfTheHeralds.java index 1a161bba1c0..5f209c4bf98 100644 --- a/Mage.Sets/src/mage/cards/f/ForerunnerOfTheHeralds.java +++ b/Mage.Sets/src/mage/cards/f/ForerunnerOfTheHeralds.java @@ -17,7 +17,6 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterBySubtypeCard; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCardInLibrary; /** @@ -29,7 +28,7 @@ public final class ForerunnerOfTheHeralds extends CardImpl { private static final FilterPermanent filterAnotherMerfolk = new FilterPermanent(SubType.MERFOLK, "another " + SubType.MERFOLK.toString()); static { filterAnotherMerfolk.add(AnotherPredicate.instance); - filterAnotherMerfolk.add(new ControllerPredicate(TargetController.YOU)); + filterAnotherMerfolk.add(TargetController.YOU.getControllerPredicate()); } public ForerunnerOfTheHeralds(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/ForerunnerOfTheLegion.java b/Mage.Sets/src/mage/cards/f/ForerunnerOfTheLegion.java index f5efb3eea30..0709c383d35 100644 --- a/Mage.Sets/src/mage/cards/f/ForerunnerOfTheLegion.java +++ b/Mage.Sets/src/mage/cards/f/ForerunnerOfTheLegion.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.filter.FilterPermanent; import mage.filter.common.FilterBySubtypeCard; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetCreaturePermanent; @@ -27,7 +26,7 @@ public final class ForerunnerOfTheLegion extends CardImpl { private static final FilterPermanent filterAnotherVampire = new FilterPermanent(SubType.VAMPIRE, "another " + SubType.VAMPIRE.toString()); static { filterAnotherVampire.add(AnotherPredicate.instance); - filterAnotherVampire.add(new ControllerPredicate(TargetController.YOU)); + filterAnotherVampire.add(TargetController.YOU.getControllerPredicate()); } public ForerunnerOfTheLegion(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FoulTongueShriek.java b/Mage.Sets/src/mage/cards/f/FoulTongueShriek.java index ac4ad8bffef..fda28291705 100644 --- a/Mage.Sets/src/mage/cards/f/FoulTongueShriek.java +++ b/Mage.Sets/src/mage/cards/f/FoulTongueShriek.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; @@ -45,7 +44,7 @@ class FoulTongueShriekEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public FoulTongueShriekEffect() { diff --git a/Mage.Sets/src/mage/cards/f/FoundryHornet.java b/Mage.Sets/src/mage/cards/f/FoundryHornet.java index 86571157dc4..b4dd4149941 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryHornet.java +++ b/Mage.Sets/src/mage/cards/f/FoundryHornet.java @@ -18,7 +18,6 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; /** @@ -32,7 +31,7 @@ public final class FoundryHornet extends CardImpl { static { filter.add(new CounterPredicate(CounterType.P1P1)); - filterOpponent.add(new ControllerPredicate(TargetController.OPPONENT)); + filterOpponent.add(TargetController.OPPONENT.getControllerPredicate()); } private static final String rule = "When {this} enters the battlefield, if you control a creature with a +1/+1 counter on it, creatures your opponents control get -1/-1 until end of turn."; diff --git a/Mage.Sets/src/mage/cards/f/FoundryStreetDenizen.java b/Mage.Sets/src/mage/cards/f/FoundryStreetDenizen.java index e60bfdec3b7..f42e4f34654 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryStreetDenizen.java +++ b/Mage.Sets/src/mage/cards/f/FoundryStreetDenizen.java @@ -17,7 +17,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -28,7 +27,7 @@ public final class FoundryStreetDenizen extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("another red creature"); static { filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(new ColorPredicate(ObjectColor.RED)); } diff --git a/Mage.Sets/src/mage/cards/f/FrontierSiege.java b/Mage.Sets/src/mage/cards/f/FrontierSiege.java index 00af641bf3b..7110ac9dde0 100644 --- a/Mage.Sets/src/mage/cards/f/FrontierSiege.java +++ b/Mage.Sets/src/mage/cards/f/FrontierSiege.java @@ -17,7 +17,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -35,9 +34,9 @@ public final class FrontierSiege extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("a creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(new AbilityPredicate(FlyingAbility.class)); - filter2.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter2.add(TargetController.NOT_YOU.getControllerPredicate()); } private static final String ruleTrigger1 = "&bull Khans — At the beginning of each of your main phases, add {G}{G}."; private static final String ruleTrigger2 = "&bull Dragons — Whenever a creature with flying enters the battlefield under your control, you may have it fight target creature you don't control."; diff --git a/Mage.Sets/src/mage/cards/f/FumikoTheLowblood.java b/Mage.Sets/src/mage/cards/f/FumikoTheLowblood.java index 511dac09b2c..148f68f5130 100644 --- a/Mage.Sets/src/mage/cards/f/FumikoTheLowblood.java +++ b/Mage.Sets/src/mage/cards/f/FumikoTheLowblood.java @@ -15,7 +15,6 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.watchers.common.AttackedThisTurnWatcher; /** @@ -38,7 +37,7 @@ public final class FumikoTheLowblood extends CardImpl { // Creatures your opponents control attack each turn if able. FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AttacksIfAbleAllEffect(filter)), new AttackedThisTurnWatcher()); } diff --git a/Mage.Sets/src/mage/cards/g/GOTOJAIL.java b/Mage.Sets/src/mage/cards/g/GOTOJAIL.java index 9eaf8923b56..2bfe95c33da 100644 --- a/Mage.Sets/src/mage/cards/g/GOTOJAIL.java +++ b/Mage.Sets/src/mage/cards/g/GOTOJAIL.java @@ -18,7 +18,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -36,7 +35,7 @@ public final class GOTOJAIL extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public GOTOJAIL(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GadwickTheWizened.java b/Mage.Sets/src/mage/cards/g/GadwickTheWizened.java index 8f0e0a6422d..eb4a4f91ee5 100644 --- a/Mage.Sets/src/mage/cards/g/GadwickTheWizened.java +++ b/Mage.Sets/src/mage/cards/g/GadwickTheWizened.java @@ -16,7 +16,6 @@ import mage.filter.FilterPermanent; import mage.filter.FilterSpell; import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.Spell; @@ -37,7 +36,7 @@ public final class GadwickTheWizened extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.BLUE)); - filter2.add(new ControllerPredicate(TargetController.OPPONENT)); + filter2.add(TargetController.OPPONENT.getControllerPredicate()); } public GadwickTheWizened(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GaeasAvenger.java b/Mage.Sets/src/mage/cards/g/GaeasAvenger.java index 9aa7b4a05c8..2e74e39544f 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasAvenger.java +++ b/Mage.Sets/src/mage/cards/g/GaeasAvenger.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -27,7 +26,7 @@ public final class GaeasAvenger extends CardImpl { private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("artifacts opponent control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public GaeasAvenger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GalecasterColossus.java b/Mage.Sets/src/mage/cards/g/GalecasterColossus.java index f3d31bf2141..8d61854d609 100644 --- a/Mage.Sets/src/mage/cards/g/GalecasterColossus.java +++ b/Mage.Sets/src/mage/cards/g/GalecasterColossus.java @@ -16,7 +16,6 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetNonlandPermanent; @@ -31,7 +30,7 @@ public final class GalecasterColossus extends CardImpl { private static final FilterControlledPermanent filter2 = new FilterControlledPermanent("untapped Wizard you control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); filter2.add(SubType.WIZARD.getPredicate()); filter2.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/g/GamorreanPrisonGuard.java b/Mage.Sets/src/mage/cards/g/GamorreanPrisonGuard.java index 6def0ed877f..c81dfa12a5c 100644 --- a/Mage.Sets/src/mage/cards/g/GamorreanPrisonGuard.java +++ b/Mage.Sets/src/mage/cards/g/GamorreanPrisonGuard.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -25,7 +24,7 @@ public final class GamorreanPrisonGuard extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("a creature"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public GamorreanPrisonGuard(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GargosViciousWatcher.java b/Mage.Sets/src/mage/cards/g/GargosViciousWatcher.java index 1089f6b5ed3..4d911a0a398 100644 --- a/Mage.Sets/src/mage/cards/g/GargosViciousWatcher.java +++ b/Mage.Sets/src/mage/cards/g/GargosViciousWatcher.java @@ -13,7 +13,6 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -66,7 +65,7 @@ class GargosViciousWatcherTriggeredAbility extends TriggeredAbilityImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } GargosViciousWatcherTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/g/GateToTheAfterlife.java b/Mage.Sets/src/mage/cards/g/GateToTheAfterlife.java index b8c64ac3bd2..926d87adc6f 100644 --- a/Mage.Sets/src/mage/cards/g/GateToTheAfterlife.java +++ b/Mage.Sets/src/mage/cards/g/GateToTheAfterlife.java @@ -24,7 +24,6 @@ import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.players.Player; @@ -40,7 +39,7 @@ public final class GateToTheAfterlife extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a nontoken creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.not(TokenPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/g/GauntletsOfChaos.java b/Mage.Sets/src/mage/cards/g/GauntletsOfChaos.java index 1dcbacc6952..9d5075759b7 100644 --- a/Mage.Sets/src/mage/cards/g/GauntletsOfChaos.java +++ b/Mage.Sets/src/mage/cards/g/GauntletsOfChaos.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -131,7 +130,7 @@ class GauntletsOfChaosSecondTarget extends TargetPermanent { public GauntletsOfChaosSecondTarget() { super(); this.filter = this.filter.copy(); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); setTargetName("permanent an opponent controls that shares one of those types with it"); } diff --git a/Mage.Sets/src/mage/cards/g/GavonyUnhallowed.java b/Mage.Sets/src/mage/cards/g/GavonyUnhallowed.java index 17b8d03727f..246c93be398 100644 --- a/Mage.Sets/src/mage/cards/g/GavonyUnhallowed.java +++ b/Mage.Sets/src/mage/cards/g/GavonyUnhallowed.java @@ -13,7 +13,6 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class GavonyUnhallowed extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public GavonyUnhallowed(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/Geistblast.java b/Mage.Sets/src/mage/cards/g/Geistblast.java index c1c754d4165..b7742d82b71 100644 --- a/Mage.Sets/src/mage/cards/g/Geistblast.java +++ b/Mage.Sets/src/mage/cards/g/Geistblast.java @@ -15,7 +15,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetSpell; import mage.target.common.TargetAnyTarget; @@ -31,7 +30,7 @@ public final class Geistblast extends CardImpl { filter.add(Predicates.or( CardType.INSTANT.getPredicate(), CardType.SORCERY.getPredicate())); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public Geistblast(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GeneralHux.java b/Mage.Sets/src/mage/cards/g/GeneralHux.java index 42bfd880d24..83706bedfa4 100644 --- a/Mage.Sets/src/mage/cards/g/GeneralHux.java +++ b/Mage.Sets/src/mage/cards/g/GeneralHux.java @@ -9,14 +9,11 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; -import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.constants.*; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; /** @@ -28,7 +25,7 @@ public final class GeneralHux extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("{this} or another nontoken creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.not(TokenPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/g/Ghostway.java b/Mage.Sets/src/mage/cards/g/Ghostway.java index 17ea244f3ff..000b248d183 100644 --- a/Mage.Sets/src/mage/cards/g/Ghostway.java +++ b/Mage.Sets/src/mage/cards/g/Ghostway.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.players.Player; import mage.target.targetpointer.FixedTargets; @@ -50,7 +49,7 @@ class GhostwayEffect extends OneShotEffect { static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public GhostwayEffect() { diff --git a/Mage.Sets/src/mage/cards/g/GideonBattleForged.java b/Mage.Sets/src/mage/cards/g/GideonBattleForged.java index 13b4d2d8ba4..f5f82fd62f7 100644 --- a/Mage.Sets/src/mage/cards/g/GideonBattleForged.java +++ b/Mage.Sets/src/mage/cards/g/GideonBattleForged.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.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.TokenImpl; @@ -32,7 +31,7 @@ public final class GideonBattleForged extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public GideonBattleForged(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GideonsAvenger.java b/Mage.Sets/src/mage/cards/g/GideonsAvenger.java index b091da15311..fd837facb19 100644 --- a/Mage.Sets/src/mage/cards/g/GideonsAvenger.java +++ b/Mage.Sets/src/mage/cards/g/GideonsAvenger.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -23,7 +22,7 @@ public final class GideonsAvenger extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public GideonsAvenger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GildedDrake.java b/Mage.Sets/src/mage/cards/g/GildedDrake.java index 7c640a0e39e..8f067ba7ff1 100644 --- a/Mage.Sets/src/mage/cards/g/GildedDrake.java +++ b/Mage.Sets/src/mage/cards/g/GildedDrake.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -32,7 +31,7 @@ public final class GildedDrake extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public GildedDrake(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GlacialChasm.java b/Mage.Sets/src/mage/cards/g/GlacialChasm.java index 4d85080ce66..5d50ee6524d 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialChasm.java +++ b/Mage.Sets/src/mage/cards/g/GlacialChasm.java @@ -17,7 +17,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -34,7 +33,7 @@ public final class GlacialChasm extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new SacrificeControllerEffect(StaticFilters.FILTER_LAND, 1, ""))); // Creatures you control can't attack. FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control"); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAnyPlayerAllEffect(Duration.WhileOnBattlefield, filter))); // Prevent all damage that would be dealt to you. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventDamageToControllerEffect(Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/g/GlaringAegis.java b/Mage.Sets/src/mage/cards/g/GlaringAegis.java index 945de682a78..352e0a9720c 100644 --- a/Mage.Sets/src/mage/cards/g/GlaringAegis.java +++ b/Mage.Sets/src/mage/cards/g/GlaringAegis.java @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -26,7 +25,7 @@ public final class GlaringAegis extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public GlaringAegis(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GlassdustHulk.java b/Mage.Sets/src/mage/cards/g/GlassdustHulk.java index 69c9f6c2bd5..a14cdf1c060 100644 --- a/Mage.Sets/src/mage/cards/g/GlassdustHulk.java +++ b/Mage.Sets/src/mage/cards/g/GlassdustHulk.java @@ -18,7 +18,6 @@ import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -29,7 +28,7 @@ public final class GlassdustHulk extends CardImpl { private static final FilterPermanent filter = new FilterArtifactPermanent("another artifact"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/g/GlazeFiend.java b/Mage.Sets/src/mage/cards/g/GlazeFiend.java index ca91ea31291..b1c1548d585 100644 --- a/Mage.Sets/src/mage/cards/g/GlazeFiend.java +++ b/Mage.Sets/src/mage/cards/g/GlazeFiend.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class GlazeFiend extends CardImpl { private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("another artifact"); static { filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public GlazeFiend(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java b/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java index ceb983bfbf0..b7fc79084a4 100644 --- a/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java +++ b/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java @@ -15,9 +15,7 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.TokenImpl; -import mage.game.permanent.token.Token; /** * @@ -27,7 +25,7 @@ public final class GlintHawkIdol extends CardImpl { private static final FilterPermanent filter = new FilterArtifactPermanent("another artifact"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/g/Glorybringer.java b/Mage.Sets/src/mage/cards/g/Glorybringer.java index 73084bb905f..da38c14a9bc 100644 --- a/Mage.Sets/src/mage/cards/g/Glorybringer.java +++ b/Mage.Sets/src/mage/cards/g/Glorybringer.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -29,7 +28,7 @@ public final class Glorybringer extends CardImpl { static { filter.add(Predicates.not(SubType.DRAGON.getPredicate())); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public Glorybringer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinChainwhirler.java b/Mage.Sets/src/mage/cards/g/GoblinChainwhirler.java index 1422181977a..a57350c0e7b 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinChainwhirler.java +++ b/Mage.Sets/src/mage/cards/g/GoblinChainwhirler.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -29,7 +28,7 @@ public final class GoblinChainwhirler extends CardImpl { filter.add(Predicates.or( CardType.CREATURE.getPredicate(), CardType.PLANESWALKER.getPredicate())); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public GoblinChainwhirler(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinKites.java b/Mage.Sets/src/mage/cards/g/GoblinKites.java index cc2e03fef09..afeefacc81c 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinKites.java +++ b/Mage.Sets/src/mage/cards/g/GoblinKites.java @@ -15,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -31,7 +30,7 @@ public final class GoblinKites extends CardImpl { static { filter.add(new PowerPredicate(ComparisonType.FEWER_THAN, 3)); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public GoblinKites(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java b/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java index 6190cfee3c1..a49424db2a5 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java +++ b/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java @@ -18,7 +18,6 @@ import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.AttackingPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.GoblinToken; import mage.watchers.common.AttackedThisTurnWatcher; @@ -33,7 +32,7 @@ public final class GoblinRabblemaster extends CardImpl { static { otherGoblinFilter.add(AnotherPredicate.instance); - otherGoblinFilter.add(new ControllerPredicate(TargetController.YOU)); + otherGoblinFilter.add(TargetController.YOU.getControllerPredicate()); attackingFilter.add(AttackingPredicate.instance); attackingFilter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarDrums.java b/Mage.Sets/src/mage/cards/g/GoblinWarDrums.java index 1c1d0180fb0..8a7bb41cfff 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWarDrums.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWarDrums.java @@ -12,7 +12,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -22,7 +21,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public GoblinWarDrums(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarStrike.java b/Mage.Sets/src/mage/cards/g/GoblinWarStrike.java index 8b654ff9677..c83d265f0db 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWarStrike.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWarStrike.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetPlayerOrPlaneswalker; /** @@ -23,7 +22,7 @@ public final class GoblinWarStrike extends CardImpl { static { filter.add(SubType.GOBLIN.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public GoblinWarStrike(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoldenDemise.java b/Mage.Sets/src/mage/cards/g/GoldenDemise.java index f4a14a8c98a..6f3ba364040 100644 --- a/Mage.Sets/src/mage/cards/g/GoldenDemise.java +++ b/Mage.Sets/src/mage/cards/g/GoldenDemise.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -31,7 +30,7 @@ public final class GoldenDemise extends CardImpl { // All creatures get -2/-2 until end of turn. If you have the city's blessing, instead only creatures your opponents control get -2/-2 until end of turn. FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control"); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); this.getSpellAbility().addEffect(new ConditionalContinuousEffect( new BoostAllEffect(-2, -2, Duration.EndOfTurn, filter, false), new BoostAllEffect(-2, -2, Duration.EndOfTurn), diff --git a/Mage.Sets/src/mage/cards/g/GolgariGermination.java b/Mage.Sets/src/mage/cards/g/GolgariGermination.java index f6890106e67..944924a4e09 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariGermination.java +++ b/Mage.Sets/src/mage/cards/g/GolgariGermination.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.SaprolingToken; @@ -23,7 +22,7 @@ public final class GolgariGermination extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.not(TokenPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/g/GontisAetherHeart.java b/Mage.Sets/src/mage/cards/g/GontisAetherHeart.java index 2e4f44de3b6..08a770f1cc9 100644 --- a/Mage.Sets/src/mage/cards/g/GontisAetherHeart.java +++ b/Mage.Sets/src/mage/cards/g/GontisAetherHeart.java @@ -27,7 +27,7 @@ public final class GontisAetherHeart extends CardImpl { private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("{this} or another artifact"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public GontisAetherHeart(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GraniteGrip.java b/Mage.Sets/src/mage/cards/g/GraniteGrip.java index 9578425c759..2f0c596ed61 100644 --- a/Mage.Sets/src/mage/cards/g/GraniteGrip.java +++ b/Mage.Sets/src/mage/cards/g/GraniteGrip.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -25,7 +24,7 @@ public final class GraniteGrip extends CardImpl { static { filter.add(SubType.MOUNTAIN.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public GraniteGrip(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java b/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java index a208535e70c..fa6bc464974 100644 --- a/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java +++ b/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -29,7 +28,7 @@ public final class GreatbowDoyen extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Archer creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.ARCHER.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/g/GreaterAuramancy.java b/Mage.Sets/src/mage/cards/g/GreaterAuramancy.java index d982c17337f..4adb53015dd 100644 --- a/Mage.Sets/src/mage/cards/g/GreaterAuramancy.java +++ b/Mage.Sets/src/mage/cards/g/GreaterAuramancy.java @@ -12,7 +12,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.EnchantedPredicate; /** @@ -26,9 +25,9 @@ public final class GreaterAuramancy extends CardImpl { private static final FilterPermanent filter2 = new FilterPermanent("Enchanted creatures"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(CardType.ENCHANTMENT.getPredicate()); - filter2.add(new ControllerPredicate(TargetController.YOU)); + filter2.add(TargetController.YOU.getControllerPredicate()); filter2.add(CardType.CREATURE.getPredicate()); filter2.add(EnchantedPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/g/GrimContest.java b/Mage.Sets/src/mage/cards/g/GrimContest.java index 304e2bab6b4..d3d9ab9b364 100644 --- a/Mage.Sets/src/mage/cards/g/GrimContest.java +++ b/Mage.Sets/src/mage/cards/g/GrimContest.java @@ -26,7 +26,7 @@ public final class GrimContest extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public GrimContest(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GrimHaruspex.java b/Mage.Sets/src/mage/cards/g/GrimHaruspex.java index bf0c9d478ba..19fd21ae038 100644 --- a/Mage.Sets/src/mage/cards/g/GrimHaruspex.java +++ b/Mage.Sets/src/mage/cards/g/GrimHaruspex.java @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; /** @@ -27,7 +26,7 @@ public final class GrimHaruspex extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another nontoken creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); filter.add(Predicates.not(TokenPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/g/GrowingRanks.java b/Mage.Sets/src/mage/cards/g/GrowingRanks.java index 80e9cc91828..be7136d5076 100644 --- a/Mage.Sets/src/mage/cards/g/GrowingRanks.java +++ b/Mage.Sets/src/mage/cards/g/GrowingRanks.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @author LevelX2 @@ -19,7 +18,7 @@ public final class GrowingRanks extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public GrowingRanks(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GruesomeFate.java b/Mage.Sets/src/mage/cards/g/GruesomeFate.java index 77dcdc8adf8..088a916e14d 100644 --- a/Mage.Sets/src/mage/cards/g/GruesomeFate.java +++ b/Mage.Sets/src/mage/cards/g/GruesomeFate.java @@ -7,10 +7,7 @@ import mage.abilities.effects.common.LoseLifeOpponentsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.filter.StaticFilters; -import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/g/GruulRagebeast.java b/Mage.Sets/src/mage/cards/g/GruulRagebeast.java index 7ac876b7ce1..7a7ec1517a4 100644 --- a/Mage.Sets/src/mage/cards/g/GruulRagebeast.java +++ b/Mage.Sets/src/mage/cards/g/GruulRagebeast.java @@ -15,7 +15,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -32,7 +31,7 @@ public final class GruulRagebeast extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creature an opponent controls"); static { - filter2.add(new ControllerPredicate(TargetController.OPPONENT)); + filter2.add(TargetController.OPPONENT.getControllerPredicate()); } public GruulRagebeast(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GruulWarChant.java b/Mage.Sets/src/mage/cards/g/GruulWarChant.java index d403a4a3670..acf1f362728 100644 --- a/Mage.Sets/src/mage/cards/g/GruulWarChant.java +++ b/Mage.Sets/src/mage/cards/g/GruulWarChant.java @@ -15,7 +15,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AttackingPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class GruulWarChant extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("attacking creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AttackingPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/g/GuardianOfTazeem.java b/Mage.Sets/src/mage/cards/g/GuardianOfTazeem.java index a550fb2d671..d020498187d 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianOfTazeem.java +++ b/Mage.Sets/src/mage/cards/g/GuardianOfTazeem.java @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -31,7 +30,7 @@ public final class GuardianOfTazeem extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public GuardianOfTazeem(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GuardiansMagemark.java b/Mage.Sets/src/mage/cards/g/GuardiansMagemark.java index b16ee18b66b..0a4291083c6 100644 --- a/Mage.Sets/src/mage/cards/g/GuardiansMagemark.java +++ b/Mage.Sets/src/mage/cards/g/GuardiansMagemark.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.EnchantedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -26,7 +25,7 @@ public final class GuardiansMagemark extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control that are enchanted"); static { filter.add(EnchantedPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public GuardiansMagemark(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GuildSummit.java b/Mage.Sets/src/mage/cards/g/GuildSummit.java index 0a73922e9f4..748fa134a14 100644 --- a/Mage.Sets/src/mage/cards/g/GuildSummit.java +++ b/Mage.Sets/src/mage/cards/g/GuildSummit.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.players.Player; @@ -62,7 +61,7 @@ class GuildSummitEffect extends OneShotEffect { = new FilterPermanent("untapped Gates you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); filter.add(SubType.GATE.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/g/GustcloakSavior.java b/Mage.Sets/src/mage/cards/g/GustcloakSavior.java index a3659b92c95..d63bc82f150 100644 --- a/Mage.Sets/src/mage/cards/g/GustcloakSavior.java +++ b/Mage.Sets/src/mage/cards/g/GustcloakSavior.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -26,7 +25,7 @@ public final class GustcloakSavior extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public GustcloakSavior(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GwafaHazidProfiteer.java b/Mage.Sets/src/mage/cards/g/GwafaHazidProfiteer.java index 4368890ee03..65c37123760 100644 --- a/Mage.Sets/src/mage/cards/g/GwafaHazidProfiteer.java +++ b/Mage.Sets/src/mage/cards/g/GwafaHazidProfiteer.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -29,7 +28,7 @@ public final class GwafaHazidProfiteer extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public GwafaHazidProfiteer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HaazdaSnareSquad.java b/Mage.Sets/src/mage/cards/h/HaazdaSnareSquad.java index 704b8eb638f..fd51041bfe3 100644 --- a/Mage.Sets/src/mage/cards/h/HaazdaSnareSquad.java +++ b/Mage.Sets/src/mage/cards/h/HaazdaSnareSquad.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; @@ -30,7 +29,7 @@ public final class HaazdaSnareSquad extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public HaazdaSnareSquad (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HagraDiabolist.java b/Mage.Sets/src/mage/cards/h/HagraDiabolist.java index 639d4ba416b..60b183747a3 100644 --- a/Mage.Sets/src/mage/cards/h/HagraDiabolist.java +++ b/Mage.Sets/src/mage/cards/h/HagraDiabolist.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPlayer; /** @@ -26,7 +25,7 @@ public final class HagraDiabolist extends CardImpl { static { filter.add(SubType.ALLY.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public HagraDiabolist(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HailStorm.java b/Mage.Sets/src/mage/cards/h/HailStorm.java index 2d4a81f290d..037e12fe723 100644 --- a/Mage.Sets/src/mage/cards/h/HailStorm.java +++ b/Mage.Sets/src/mage/cards/h/HailStorm.java @@ -7,11 +7,8 @@ import mage.abilities.effects.common.DamageControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.filter.common.FilterAttackingCreature; -import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/h/HalimarExcavator.java b/Mage.Sets/src/mage/cards/h/HalimarExcavator.java index 7b7124ef004..9542a610e28 100644 --- a/Mage.Sets/src/mage/cards/h/HalimarExcavator.java +++ b/Mage.Sets/src/mage/cards/h/HalimarExcavator.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPlayer; /** @@ -26,7 +25,7 @@ public final class HalimarExcavator extends CardImpl { static { filter.add(SubType.ALLY.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public HalimarExcavator(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HanSolo.java b/Mage.Sets/src/mage/cards/h/HanSolo.java index 7c0017e7018..c20a445941e 100644 --- a/Mage.Sets/src/mage/cards/h/HanSolo.java +++ b/Mage.Sets/src/mage/cards/h/HanSolo.java @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -26,7 +25,7 @@ public final class HanSolo extends CardImpl { static { filter.add(SubType.STARSHIP.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public HanSolo(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HandsOfBinding.java b/Mage.Sets/src/mage/cards/h/HandsOfBinding.java index 586d58edd84..2bd3b273a5a 100644 --- a/Mage.Sets/src/mage/cards/h/HandsOfBinding.java +++ b/Mage.Sets/src/mage/cards/h/HandsOfBinding.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -21,7 +20,7 @@ public final class HandsOfBinding extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static{ - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public HandsOfBinding (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HaphazardBombardment.java b/Mage.Sets/src/mage/cards/h/HaphazardBombardment.java index d755d2abfee..73b2b5fceb1 100644 --- a/Mage.Sets/src/mage/cards/h/HaphazardBombardment.java +++ b/Mage.Sets/src/mage/cards/h/HaphazardBombardment.java @@ -19,7 +19,6 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -41,7 +40,7 @@ public final class HaphazardBombardment extends CardImpl { // At the beginning of your end step, if two or more permanents you don't control have an aim counter on them, destroy one of those permanents at random. FilterPermanent filter = new FilterPermanent("if two or more permanents you don't control have an aim counter on them"); - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); filter.add(new CounterPredicate(CounterType.AIM)); this.addAbility(new ConditionalInterveningIfTriggeredAbility(new BeginningOfYourEndStepTriggeredAbility(new HaphazardBombardmentEndOfTurnEffect(), false), new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 1, false), @@ -80,7 +79,7 @@ class HaphazardBombardmentEffect extends OneShotEffect { if (controller != null) { FilterPermanent filter = new FilterPermanent("nonenchantment permanents you don't control"); filter.add(Predicates.not(CardType.ENCHANTMENT.getPredicate())); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); List permanents = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game); if (permanents.size() > 4) { permanents.clear(); @@ -126,7 +125,7 @@ class HaphazardBombardmentEndOfTurnEffect extends OneShotEffect { // select the permanent destroyed at random from among the permanents with aim counters // that don't have indestructible. FilterPermanent filter = new FilterPermanent("if two or more permanents you don't control have an aim counter on them"); - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); filter.add(new CounterPredicate(CounterType.AIM)); filter.add(Predicates.not(new AbilityPredicate(IndestructibleAbility.class))); List permanents = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game); diff --git a/Mage.Sets/src/mage/cards/h/HarbingerOfTheTides.java b/Mage.Sets/src/mage/cards/h/HarbingerOfTheTides.java index b88edd61b70..bb847ffa4ff 100644 --- a/Mage.Sets/src/mage/cards/h/HarbingerOfTheTides.java +++ b/Mage.Sets/src/mage/cards/h/HarbingerOfTheTides.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetCreaturePermanent; @@ -28,7 +27,7 @@ public final class HarbingerOfTheTides extends CardImpl { static { filter.add(TappedPredicate.instance); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public HarbingerOfTheTides(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HarmonyOfNature.java b/Mage.Sets/src/mage/cards/h/HarmonyOfNature.java index 33bcb4b7a72..ea689c32e1f 100644 --- a/Mage.Sets/src/mage/cards/h/HarmonyOfNature.java +++ b/Mage.Sets/src/mage/cards/h/HarmonyOfNature.java @@ -14,7 +14,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.players.Player; @@ -48,7 +47,7 @@ class HarmonyOfNatureEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/h/HateMirage.java b/Mage.Sets/src/mage/cards/h/HateMirage.java index 15ca94ff068..15ac2fb9934 100644 --- a/Mage.Sets/src/mage/cards/h/HateMirage.java +++ b/Mage.Sets/src/mage/cards/h/HateMirage.java @@ -10,7 +10,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.target.Target; import mage.target.TargetPermanent; @@ -27,7 +26,7 @@ public final class HateMirage extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("creatures you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public HateMirage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HeavyInfantry.java b/Mage.Sets/src/mage/cards/h/HeavyInfantry.java index 39fc7e77ebd..d85e94ef69a 100644 --- a/Mage.Sets/src/mage/cards/h/HeavyInfantry.java +++ b/Mage.Sets/src/mage/cards/h/HeavyInfantry.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class HeavyInfantry extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public HeavyInfantry(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HeliodsEmissary.java b/Mage.Sets/src/mage/cards/h/HeliodsEmissary.java index e8654874c11..34c4163846b 100644 --- a/Mage.Sets/src/mage/cards/h/HeliodsEmissary.java +++ b/Mage.Sets/src/mage/cards/h/HeliodsEmissary.java @@ -19,7 +19,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; @@ -31,7 +30,7 @@ public final class HeliodsEmissary extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public HeliodsEmissary(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HellkiteIgniter.java b/Mage.Sets/src/mage/cards/h/HellkiteIgniter.java index f69ac3f81a9..3accec169fa 100644 --- a/Mage.Sets/src/mage/cards/h/HellkiteIgniter.java +++ b/Mage.Sets/src/mage/cards/h/HellkiteIgniter.java @@ -18,7 +18,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -29,7 +28,7 @@ public final class HellkiteIgniter extends CardImpl { private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("artifact you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public HellkiteIgniter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HelmOfTheGods.java b/Mage.Sets/src/mage/cards/h/HelmOfTheGods.java index 746ebaae16c..7abe1b89141 100644 --- a/Mage.Sets/src/mage/cards/h/HelmOfTheGods.java +++ b/Mage.Sets/src/mage/cards/h/HelmOfTheGods.java @@ -16,7 +16,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterEnchantmentPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -27,7 +26,7 @@ public final class HelmOfTheGods extends CardImpl { private static final FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent("enchantment you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public HelmOfTheGods(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/Helvault.java b/Mage.Sets/src/mage/cards/h/Helvault.java index 00012902d8f..b361d5a7c81 100644 --- a/Mage.Sets/src/mage/cards/h/Helvault.java +++ b/Mage.Sets/src/mage/cards/h/Helvault.java @@ -15,7 +15,6 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -28,7 +27,7 @@ public final class Helvault extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public Helvault(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HeraldOfLeshrac.java b/Mage.Sets/src/mage/cards/h/HeraldOfLeshrac.java index 3d226e3a9a4..1ae97254ffe 100644 --- a/Mage.Sets/src/mage/cards/h/HeraldOfLeshrac.java +++ b/Mage.Sets/src/mage/cards/h/HeraldOfLeshrac.java @@ -28,7 +28,6 @@ import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.other.OwnerIdPredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.Target; @@ -80,7 +79,7 @@ class HeraldOfLeshracCumulativeCost extends CostImpl { private static final FilterPermanent filter = new FilterLandPermanent("land you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } HeraldOfLeshracCumulativeCost() { diff --git a/Mage.Sets/src/mage/cards/h/HerosBlade.java b/Mage.Sets/src/mage/cards/h/HerosBlade.java index 4f4ba1e35af..5ff21c3c657 100644 --- a/Mage.Sets/src/mage/cards/h/HerosBlade.java +++ b/Mage.Sets/src/mage/cards/h/HerosBlade.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class HerosBlade extends CardImpl { static { filter.add(SuperType.LEGENDARY.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public HerosBlade(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HiddenDragonslayer.java b/Mage.Sets/src/mage/cards/h/HiddenDragonslayer.java index aa9df045c11..4a4cb5fd1c3 100644 --- a/Mage.Sets/src/mage/cards/h/HiddenDragonslayer.java +++ b/Mage.Sets/src/mage/cards/h/HiddenDragonslayer.java @@ -17,7 +17,6 @@ import mage.constants.ComparisonType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -30,7 +29,7 @@ public final class HiddenDragonslayer extends CardImpl { static { filter.add(new PowerPredicate(ComparisonType.MORE_THAN, 3)); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public HiddenDragonslayer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HiddenPredators.java b/Mage.Sets/src/mage/cards/h/HiddenPredators.java index cd7cc4a98f0..c483339629e 100644 --- a/Mage.Sets/src/mage/cards/h/HiddenPredators.java +++ b/Mage.Sets/src/mage/cards/h/HiddenPredators.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.token.TokenImpl; @@ -42,7 +41,7 @@ class HiddenPredatorsStateTriggeredAbility extends StateTriggeredAbility { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filter.add(new PowerPredicate(ComparisonType.MORE_THAN, 3)); } diff --git a/Mage.Sets/src/mage/cards/h/HieromancersCage.java b/Mage.Sets/src/mage/cards/h/HieromancersCage.java index 55c0c5366da..c112934f4d2 100644 --- a/Mage.Sets/src/mage/cards/h/HieromancersCage.java +++ b/Mage.Sets/src/mage/cards/h/HieromancersCage.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; /** @@ -23,7 +22,7 @@ public final class HieromancersCage extends CardImpl { private static final FilterNonlandPermanent filter = new FilterNonlandPermanent(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public HieromancersCage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HighlandBerserker.java b/Mage.Sets/src/mage/cards/h/HighlandBerserker.java index bf1edeca06b..fb913e11956 100644 --- a/Mage.Sets/src/mage/cards/h/HighlandBerserker.java +++ b/Mage.Sets/src/mage/cards/h/HighlandBerserker.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -26,7 +25,7 @@ public final class HighlandBerserker extends CardImpl { static { filter.add(SubType.ALLY.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public HighlandBerserker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/Hivestone.java b/Mage.Sets/src/mage/cards/h/Hivestone.java index 4617132c446..8d8929c3941 100644 --- a/Mage.Sets/src/mage/cards/h/Hivestone.java +++ b/Mage.Sets/src/mage/cards/h/Hivestone.java @@ -9,7 +9,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.util.SubTypeList; /** @@ -20,7 +19,7 @@ public final class Hivestone extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public Hivestone(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HivisOfTheScale.java b/Mage.Sets/src/mage/cards/h/HivisOfTheScale.java index 8d2d7034a07..dfd858488b1 100644 --- a/Mage.Sets/src/mage/cards/h/HivisOfTheScale.java +++ b/Mage.Sets/src/mage/cards/h/HivisOfTheScale.java @@ -21,7 +21,6 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; @@ -37,7 +36,7 @@ public final class HivisOfTheScale extends CardImpl { static { filter.add(TappedPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filterDragon.add(SubType.DRAGON.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/h/HuatliDinosaurKnight.java b/Mage.Sets/src/mage/cards/h/HuatliDinosaurKnight.java index 94995b3174e..deec5460ea8 100644 --- a/Mage.Sets/src/mage/cards/h/HuatliDinosaurKnight.java +++ b/Mage.Sets/src/mage/cards/h/HuatliDinosaurKnight.java @@ -17,7 +17,6 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -32,10 +31,10 @@ public final class HuatliDinosaurKnight extends CardImpl { static { filter.add(SubType.DINOSAUR.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); - filter2.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); + filter2.add(TargetController.NOT_YOU.getControllerPredicate()); filter3.add(SubType.DINOSAUR.getPredicate()); - filter3.add(new ControllerPredicate(TargetController.YOU)); + filter3.add(TargetController.YOU.getControllerPredicate()); } public HuatliDinosaurKnight(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HuatlisSpurring.java b/Mage.Sets/src/mage/cards/h/HuatlisSpurring.java index 3dd5c4f1f1f..3b7bba9fe05 100644 --- a/Mage.Sets/src/mage/cards/h/HuatlisSpurring.java +++ b/Mage.Sets/src/mage/cards/h/HuatlisSpurring.java @@ -12,7 +12,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class HuatlisSpurring extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("a Jace planeswalker"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(CardType.PLANESWALKER.getPredicate()); filter.add(SubType.HUATLI.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/h/HungryDragonsnake.java b/Mage.Sets/src/mage/cards/h/HungryDragonsnake.java index 81f18ab7c3a..ec12f2604fb 100644 --- a/Mage.Sets/src/mage/cards/h/HungryDragonsnake.java +++ b/Mage.Sets/src/mage/cards/h/HungryDragonsnake.java @@ -14,7 +14,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class HungryDragonsnake extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("under an opponents's control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public HungryDragonsnake(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HuntTheHunter.java b/Mage.Sets/src/mage/cards/h/HuntTheHunter.java index 894ee49cebb..9220ff2558c 100644 --- a/Mage.Sets/src/mage/cards/h/HuntTheHunter.java +++ b/Mage.Sets/src/mage/cards/h/HuntTheHunter.java @@ -14,7 +14,6 @@ import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -30,7 +29,7 @@ public final class HuntTheHunter extends CardImpl { static { filterControlledGreen.add(new ColorPredicate(ObjectColor.GREEN)); - filterOpponentGreen.add(new ControllerPredicate(TargetController.OPPONENT)); + filterOpponentGreen.add(TargetController.OPPONENT.getControllerPredicate()); filterOpponentGreen.add(new ColorPredicate(ObjectColor.GREEN)); } diff --git a/Mage.Sets/src/mage/cards/h/HuntTheWeak.java b/Mage.Sets/src/mage/cards/h/HuntTheWeak.java index e8c245c48f6..6337355f787 100644 --- a/Mage.Sets/src/mage/cards/h/HuntTheWeak.java +++ b/Mage.Sets/src/mage/cards/h/HuntTheWeak.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -25,7 +24,7 @@ public final class HuntTheWeak extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public HuntTheWeak(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HunterOfEyeblights.java b/Mage.Sets/src/mage/cards/h/HunterOfEyeblights.java index 4b1b6ccae27..994d1ea533f 100644 --- a/Mage.Sets/src/mage/cards/h/HunterOfEyeblights.java +++ b/Mage.Sets/src/mage/cards/h/HunterOfEyeblights.java @@ -18,7 +18,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterAnyPredicate; import mage.target.common.TargetCreaturePermanent; @@ -32,7 +31,7 @@ public final class HunterOfEyeblights extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creature with a counter on it"); static { - filter1.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter1.add(TargetController.NOT_YOU.getControllerPredicate()); filter2.add(CounterAnyPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/h/HyperionBlacksmith.java b/Mage.Sets/src/mage/cards/h/HyperionBlacksmith.java index ddd7a0e8448..4e4a6543684 100644 --- a/Mage.Sets/src/mage/cards/h/HyperionBlacksmith.java +++ b/Mage.Sets/src/mage/cards/h/HyperionBlacksmith.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetArtifactPermanent; /** @@ -26,7 +25,7 @@ public final class HyperionBlacksmith extends CardImpl { private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("artifact an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public HyperionBlacksmith(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HystericalBlindness.java b/Mage.Sets/src/mage/cards/h/HystericalBlindness.java index 038cf14f749..5bd3c7e2d1b 100644 --- a/Mage.Sets/src/mage/cards/h/HystericalBlindness.java +++ b/Mage.Sets/src/mage/cards/h/HystericalBlindness.java @@ -9,7 +9,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -20,7 +19,7 @@ public final class HystericalBlindness extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public HystericalBlindness(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java b/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java index 3335475a062..707c6c009c8 100644 --- a/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java +++ b/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java @@ -17,7 +17,6 @@ import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.combat.CombatGroup; import mage.game.permanent.Permanent; @@ -37,7 +36,7 @@ public final class IbHalfheartGoblinTactician extends CardImpl { filter.add(SubType.MOUNTAIN.getPredicate()); filterGoblin.add(SubType.GOBLIN.getPredicate()); filterGoblin.add(AnotherPredicate.instance); - filterGoblin.add(new ControllerPredicate(TargetController.YOU)); + filterGoblin.add(TargetController.YOU.getControllerPredicate()); } public IbHalfheartGoblinTactician(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IcefallRegent.java b/Mage.Sets/src/mage/cards/i/IcefallRegent.java index cb9d1eaee1d..dfcd5ab7112 100644 --- a/Mage.Sets/src/mage/cards/i/IcefallRegent.java +++ b/Mage.Sets/src/mage/cards/i/IcefallRegent.java @@ -34,7 +34,7 @@ public final class IcefallRegent extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public IcefallRegent(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IconOfAncestry.java b/Mage.Sets/src/mage/cards/i/IconOfAncestry.java index b27562de41c..a04801cda9d 100644 --- a/Mage.Sets/src/mage/cards/i/IconOfAncestry.java +++ b/Mage.Sets/src/mage/cards/i/IconOfAncestry.java @@ -14,7 +14,7 @@ import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ChosenSubtypePredicate; -import mage.filter.predicate.permanent.ControllerPredicate; + import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; @@ -35,7 +35,7 @@ public final class IconOfAncestry extends CardImpl { static { filter.add(ChosenSubtypePredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public IconOfAncestry(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IllusoryGains.java b/Mage.Sets/src/mage/cards/i/IllusoryGains.java index 052bfde296f..7ec59369722 100644 --- a/Mage.Sets/src/mage/cards/i/IllusoryGains.java +++ b/Mage.Sets/src/mage/cards/i/IllusoryGains.java @@ -19,7 +19,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -35,7 +34,7 @@ public final class IllusoryGains extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("a creature"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public IllusoryGains(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/ImperialAerosaur.java b/Mage.Sets/src/mage/cards/i/ImperialAerosaur.java index 1353a50288b..3f4545ee799 100644 --- a/Mage.Sets/src/mage/cards/i/ImperialAerosaur.java +++ b/Mage.Sets/src/mage/cards/i/ImperialAerosaur.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -28,7 +27,7 @@ public final class ImperialAerosaur extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/i/ImpetuousProtege.java b/Mage.Sets/src/mage/cards/i/ImpetuousProtege.java index eb774710b57..606d1dc2103 100644 --- a/Mage.Sets/src/mage/cards/i/ImpetuousProtege.java +++ b/Mage.Sets/src/mage/cards/i/ImpetuousProtege.java @@ -16,7 +16,6 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -58,7 +57,7 @@ class ImpetuousProtegeEffect extends OneShotEffect { static { filter.add(TappedPredicate.instance); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } ImpetuousProtegeEffect() { diff --git a/Mage.Sets/src/mage/cards/i/InGarruksWake.java b/Mage.Sets/src/mage/cards/i/InGarruksWake.java index d8f6cc37738..b4a56408bcb 100644 --- a/Mage.Sets/src/mage/cards/i/InGarruksWake.java +++ b/Mage.Sets/src/mage/cards/i/InGarruksWake.java @@ -9,7 +9,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @author noxx @@ -19,7 +18,7 @@ public final class InGarruksWake extends CardImpl { private static final FilterPermanent filter = new FilterCreatureOrPlaneswalkerPermanent("creatures you don't control and all planeswalkers you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public InGarruksWake(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/InactionInjunction.java b/Mage.Sets/src/mage/cards/i/InactionInjunction.java index 3adcd577eb9..5bfd0495c89 100644 --- a/Mage.Sets/src/mage/cards/i/InactionInjunction.java +++ b/Mage.Sets/src/mage/cards/i/InactionInjunction.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -21,7 +20,7 @@ public final class InactionInjunction extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public InactionInjunction(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/InciteWar.java b/Mage.Sets/src/mage/cards/i/InciteWar.java index efdbf9c83af..871a3bf0b8f 100644 --- a/Mage.Sets/src/mage/cards/i/InciteWar.java +++ b/Mage.Sets/src/mage/cards/i/InciteWar.java @@ -18,7 +18,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; @@ -33,7 +32,7 @@ public final class InciteWar extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public InciteWar(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IncreasingVengeance.java b/Mage.Sets/src/mage/cards/i/IncreasingVengeance.java index 2e2915fcdd4..9c740c9f27e 100644 --- a/Mage.Sets/src/mage/cards/i/IncreasingVengeance.java +++ b/Mage.Sets/src/mage/cards/i/IncreasingVengeance.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.stack.Spell; import mage.game.stack.StackObject; @@ -31,7 +30,7 @@ public final class IncreasingVengeance extends CardImpl { filter.add(Predicates.or( CardType.INSTANT.getPredicate(), CardType.SORCERY.getPredicate())); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public IncreasingVengeance(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IndebtedSamurai.java b/Mage.Sets/src/mage/cards/i/IndebtedSamurai.java index 562d26dcc79..08f3fbde189 100644 --- a/Mage.Sets/src/mage/cards/i/IndebtedSamurai.java +++ b/Mage.Sets/src/mage/cards/i/IndebtedSamurai.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -23,7 +22,7 @@ public final class IndebtedSamurai extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a Samurai you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.SAMURAI.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/i/InfernalDenizen.java b/Mage.Sets/src/mage/cards/i/InfernalDenizen.java index f4cd6518745..7b162869c35 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalDenizen.java +++ b/Mage.Sets/src/mage/cards/i/InfernalDenizen.java @@ -26,7 +26,6 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -76,7 +75,7 @@ class InfernalDenizenEffect extends OneShotEffect { static { filter.add(SubType.SWAMP.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } InfernalDenizenEffect() { diff --git a/Mage.Sets/src/mage/cards/i/InfiltratorsMagemark.java b/Mage.Sets/src/mage/cards/i/InfiltratorsMagemark.java index 1395f0085ca..9cfdbb6a5f1 100644 --- a/Mage.Sets/src/mage/cards/i/InfiltratorsMagemark.java +++ b/Mage.Sets/src/mage/cards/i/InfiltratorsMagemark.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.EnchantedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -31,7 +30,7 @@ public final class InfiltratorsMagemark extends CardImpl { static { filter.add(EnchantedPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public InfiltratorsMagemark(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/InvertTheSkies.java b/Mage.Sets/src/mage/cards/i/InvertTheSkies.java index b0c758b04ec..b28a08c486f 100644 --- a/Mage.Sets/src/mage/cards/i/InvertTheSkies.java +++ b/Mage.Sets/src/mage/cards/i/InvertTheSkies.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.watchers.common.ManaSpentToCastWatcher; /** @@ -30,7 +29,7 @@ public final class InvertTheSkies extends CardImpl { private static final FilterPermanent filter = new FilterPermanent(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filter.add(new AbilityPredicate(FlyingAbility.class)); filter.add(CardType.CREATURE.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/i/IroasGodOfVictory.java b/Mage.Sets/src/mage/cards/i/IroasGodOfVictory.java index 539f75b68aa..9c43c4721e3 100644 --- a/Mage.Sets/src/mage/cards/i/IroasGodOfVictory.java +++ b/Mage.Sets/src/mage/cards/i/IroasGodOfVictory.java @@ -15,7 +15,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AttackingPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -30,7 +29,7 @@ public final class IroasGodOfVictory extends CardImpl { = new FilterControlledCreaturePermanent("attacking creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filterAttacking.add(AttackingPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/i/IshiIshiAkkiCrackshot.java b/Mage.Sets/src/mage/cards/i/IshiIshiAkkiCrackshot.java index b76302f63a8..e1892f8d162 100644 --- a/Mage.Sets/src/mage/cards/i/IshiIshiAkkiCrackshot.java +++ b/Mage.Sets/src/mage/cards/i/IshiIshiAkkiCrackshot.java @@ -9,7 +9,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterSpiritOrArcaneCard; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -20,7 +19,7 @@ public final class IshiIshiAkkiCrackshot extends CardImpl { private static final FilterSpiritOrArcaneCard filter = new FilterSpiritOrArcaneCard(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public IshiIshiAkkiCrackshot(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IsolationZone.java b/Mage.Sets/src/mage/cards/i/IsolationZone.java index f8c15a2f066..646aa89a0b2 100644 --- a/Mage.Sets/src/mage/cards/i/IsolationZone.java +++ b/Mage.Sets/src/mage/cards/i/IsolationZone.java @@ -15,7 +15,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -32,7 +31,7 @@ public final class IsolationZone extends CardImpl { static { filter.add(Predicates.or(CardType.CREATURE.getPredicate(), CardType.ENCHANTMENT.getPredicate())); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public IsolationZone(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IsperiasSkywatch.java b/Mage.Sets/src/mage/cards/i/IsperiasSkywatch.java index a0a9e5f2bea..0ff33f2fc16 100644 --- a/Mage.Sets/src/mage/cards/i/IsperiasSkywatch.java +++ b/Mage.Sets/src/mage/cards/i/IsperiasSkywatch.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -25,7 +24,7 @@ public final class IsperiasSkywatch extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public IsperiasSkywatch(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IxalansBinding.java b/Mage.Sets/src/mage/cards/i/IxalansBinding.java index a1424f478f3..36996162209 100644 --- a/Mage.Sets/src/mage/cards/i/IxalansBinding.java +++ b/Mage.Sets/src/mage/cards/i/IxalansBinding.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.ExileZone; import mage.game.Game; import mage.game.events.GameEvent; @@ -30,7 +29,7 @@ public final class IxalansBinding extends CardImpl { private static final FilterNonlandPermanent filter = new FilterNonlandPermanent(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public IxalansBinding(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IzzetGuildmage.java b/Mage.Sets/src/mage/cards/i/IzzetGuildmage.java index 1bb82a47e66..6afd137ca9c 100644 --- a/Mage.Sets/src/mage/cards/i/IzzetGuildmage.java +++ b/Mage.Sets/src/mage/cards/i/IzzetGuildmage.java @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetSpell; /** @@ -31,10 +30,10 @@ public final class IzzetGuildmage extends CardImpl { static { filterInstant.add(CardType.INSTANT.getPredicate()); filterInstant.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); - filterInstant.add(new ControllerPredicate(TargetController.YOU)); + filterInstant.add(TargetController.YOU.getControllerPredicate()); filterSorcery.add(CardType.SORCERY.getPredicate()); filterSorcery.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); - filterSorcery.add(new ControllerPredicate(TargetController.YOU)); + filterSorcery.add(TargetController.YOU.getControllerPredicate()); } public IzzetGuildmage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JacesSentinel.java b/Mage.Sets/src/mage/cards/j/JacesSentinel.java index 5dccc04c0f5..518edd10eeb 100644 --- a/Mage.Sets/src/mage/cards/j/JacesSentinel.java +++ b/Mage.Sets/src/mage/cards/j/JacesSentinel.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -24,7 +23,7 @@ public final class JacesSentinel extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("a Jace planeswalker"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(CardType.PLANESWALKER.getPredicate()); filter.add(SubType.JACE.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/j/JaddiLifestrider.java b/Mage.Sets/src/mage/cards/j/JaddiLifestrider.java index ea713bf87d8..802a648f8b5 100644 --- a/Mage.Sets/src/mage/cards/j/JaddiLifestrider.java +++ b/Mage.Sets/src/mage/cards/j/JaddiLifestrider.java @@ -14,7 +14,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.players.Player; @@ -52,7 +51,7 @@ class JaddiLifestriderEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/j/JadeBearer.java b/Mage.Sets/src/mage/cards/j/JadeBearer.java index cbd78921d8e..42ab913a023 100644 --- a/Mage.Sets/src/mage/cards/j/JadeBearer.java +++ b/Mage.Sets/src/mage/cards/j/JadeBearer.java @@ -12,7 +12,6 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -25,7 +24,7 @@ public final class JadeBearer extends CardImpl { static { filterYourAnotherMerfolk.add(AnotherPredicate.instance); filterYourAnotherMerfolk.add(SubType.MERFOLK.getPredicate()); - filterYourAnotherMerfolk.add(new ControllerPredicate(TargetController.YOU)); + filterYourAnotherMerfolk.add(TargetController.YOU.getControllerPredicate()); filterYourAnotherMerfolk.setMessage("another " + SubType.MERFOLK.toString() + " you control"); } diff --git a/Mage.Sets/src/mage/cards/j/JediKnight.java b/Mage.Sets/src/mage/cards/j/JediKnight.java index a328d75745e..724301eb126 100644 --- a/Mage.Sets/src/mage/cards/j/JediKnight.java +++ b/Mage.Sets/src/mage/cards/j/JediKnight.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetNonlandPermanent; /** @@ -26,7 +25,7 @@ public final class JediKnight extends CardImpl { private static final FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanent you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public JediKnight(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JediSentinel.java b/Mage.Sets/src/mage/cards/j/JediSentinel.java index 95eeddae9fe..d0f12184899 100644 --- a/Mage.Sets/src/mage/cards/j/JediSentinel.java +++ b/Mage.Sets/src/mage/cards/j/JediSentinel.java @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -31,7 +30,7 @@ public final class JediSentinel extends CardImpl { static { filter1.add(AnotherPredicate.instance); - filter2.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter2.add(TargetController.NOT_YOU.getControllerPredicate()); } public JediSentinel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JediStarfighter.java b/Mage.Sets/src/mage/cards/j/JediStarfighter.java index c0f0e28f456..4c46b8d259e 100644 --- a/Mage.Sets/src/mage/cards/j/JediStarfighter.java +++ b/Mage.Sets/src/mage/cards/j/JediStarfighter.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -28,7 +27,7 @@ public final class JediStarfighter extends CardImpl { static { filter.add(SubType.JEDI.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public JediStarfighter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JeskaiBarricade.java b/Mage.Sets/src/mage/cards/j/JeskaiBarricade.java index 061d5edb646..e023217b1a1 100644 --- a/Mage.Sets/src/mage/cards/j/JeskaiBarricade.java +++ b/Mage.Sets/src/mage/cards/j/JeskaiBarricade.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; @@ -28,7 +27,7 @@ public final class JeskaiBarricade extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature you control"); static { filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public JeskaiBarricade(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 3d03daab51a..a4cc96705b5 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.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -31,7 +30,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.getPermanentFilter().add(TargetController.YOU.getControllerPredicate()); filter.getCardFilter().add(TargetController.YOU.getOwnerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/j/JoragaBard.java b/Mage.Sets/src/mage/cards/j/JoragaBard.java index 720373d6676..63666e04314 100644 --- a/Mage.Sets/src/mage/cards/j/JoragaBard.java +++ b/Mage.Sets/src/mage/cards/j/JoragaBard.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class JoragaBard extends CardImpl { static { filter.add(SubType.ALLY.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public JoragaBard(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JoragaWarcaller.java b/Mage.Sets/src/mage/cards/j/JoragaWarcaller.java index 197506453c3..f0bac357a22 100644 --- a/Mage.Sets/src/mage/cards/j/JoragaWarcaller.java +++ b/Mage.Sets/src/mage/cards/j/JoragaWarcaller.java @@ -16,7 +16,6 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -29,7 +28,7 @@ public final class JoragaWarcaller extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("elf creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.ELF.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/j/Joust.java b/Mage.Sets/src/mage/cards/j/Joust.java index c6ccef240f5..e5229de7503 100644 --- a/Mage.Sets/src/mage/cards/j/Joust.java +++ b/Mage.Sets/src/mage/cards/j/Joust.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -27,7 +26,7 @@ public final class Joust extends CardImpl { = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public Joust(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JudithTheScourgeDiva.java b/Mage.Sets/src/mage/cards/j/JudithTheScourgeDiva.java index 8495a10b955..46f83e51048 100644 --- a/Mage.Sets/src/mage/cards/j/JudithTheScourgeDiva.java +++ b/Mage.Sets/src/mage/cards/j/JudithTheScourgeDiva.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.target.common.TargetAnyTarget; @@ -26,7 +25,7 @@ public final class JudithTheScourgeDiva extends CardImpl { = new FilterCreaturePermanent("nontoken creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.not(TokenPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/j/JuniperOrderAdvocate.java b/Mage.Sets/src/mage/cards/j/JuniperOrderAdvocate.java index 5341817bb05..24931f94c30 100644 --- a/Mage.Sets/src/mage/cards/j/JuniperOrderAdvocate.java +++ b/Mage.Sets/src/mage/cards/j/JuniperOrderAdvocate.java @@ -18,7 +18,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -30,7 +29,7 @@ public final class JuniperOrderAdvocate extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.GREEN)); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public JuniperOrderAdvocate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KalastriaHighborn.java b/Mage.Sets/src/mage/cards/k/KalastriaHighborn.java index b2fc93f3abd..01beb96f7e6 100644 --- a/Mage.Sets/src/mage/cards/k/KalastriaHighborn.java +++ b/Mage.Sets/src/mage/cards/k/KalastriaHighborn.java @@ -15,7 +15,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; @@ -30,7 +29,7 @@ public final class KalastriaHighborn extends CardImpl { static { filter.add(SubType.VAMPIRE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public KalastriaHighborn(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KalonianHydra.java b/Mage.Sets/src/mage/cards/k/KalonianHydra.java index 65244f102f0..b1863657013 100644 --- a/Mage.Sets/src/mage/cards/k/KalonianHydra.java +++ b/Mage.Sets/src/mage/cards/k/KalonianHydra.java @@ -18,7 +18,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -60,7 +59,7 @@ class KalonianHydraEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(new CounterPredicate(CounterType.P1P1)); } diff --git a/Mage.Sets/src/mage/cards/k/KapshoKitefins.java b/Mage.Sets/src/mage/cards/k/KapshoKitefins.java index 79f1eabfbab..db6aa7c954b 100644 --- a/Mage.Sets/src/mage/cards/k/KapshoKitefins.java +++ b/Mage.Sets/src/mage/cards/k/KapshoKitefins.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -27,8 +26,8 @@ public final class KapshoKitefins extends CardImpl { private static final FilterCreaturePermanent filterTarget = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); - filterTarget.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.YOU.getControllerPredicate()); + filterTarget.add(TargetController.OPPONENT.getControllerPredicate()); } public KapshoKitefins(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KavuRunner.java b/Mage.Sets/src/mage/cards/k/KavuRunner.java index 25626d3bcda..29e2392b193 100644 --- a/Mage.Sets/src/mage/cards/k/KavuRunner.java +++ b/Mage.Sets/src/mage/cards/k/KavuRunner.java @@ -21,7 +21,6 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -33,7 +32,7 @@ public final class KavuRunner extends CardImpl { static { filter.add(Predicates.or(new ColorPredicate(ObjectColor.WHITE), new ColorPredicate(ObjectColor.BLUE))); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public KavuRunner(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KayasGhostform.java b/Mage.Sets/src/mage/cards/k/KayasGhostform.java index 84a9b05f396..f9f39df10c9 100644 --- a/Mage.Sets/src/mage/cards/k/KayasGhostform.java +++ b/Mage.Sets/src/mage/cards/k/KayasGhostform.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -28,7 +27,7 @@ public final class KayasGhostform extends CardImpl { = new FilterCreatureOrPlaneswalkerPermanent("creature or planeswalker you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public KayasGhostform(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KazuulWarlord.java b/Mage.Sets/src/mage/cards/k/KazuulWarlord.java index cbf43776edd..8e35a3b802f 100644 --- a/Mage.Sets/src/mage/cards/k/KazuulWarlord.java +++ b/Mage.Sets/src/mage/cards/k/KazuulWarlord.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -24,7 +23,7 @@ public final class KazuulWarlord extends CardImpl { static { filter.add(SubType.ALLY.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public KazuulWarlord(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KeeperOfTheLens.java b/Mage.Sets/src/mage/cards/k/KeeperOfTheLens.java index dde0b01b327..061e6892837 100644 --- a/Mage.Sets/src/mage/cards/k/KeeperOfTheLens.java +++ b/Mage.Sets/src/mage/cards/k/KeeperOfTheLens.java @@ -14,7 +14,6 @@ import mage.cards.CardsImpl; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.other.FaceDownPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -54,7 +53,7 @@ class KeeperOfTheLensLookFaceDownAbility extends ActivatedAbilityImpl { static { filter.add(FaceDownPredicate.instance); - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public KeeperOfTheLensLookFaceDownAbility() { diff --git a/Mage.Sets/src/mage/cards/k/KeepsakeGorgon.java b/Mage.Sets/src/mage/cards/k/KeepsakeGorgon.java index 14abf44dbbc..f531dafbc9b 100644 --- a/Mage.Sets/src/mage/cards/k/KeepsakeGorgon.java +++ b/Mage.Sets/src/mage/cards/k/KeepsakeGorgon.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; @@ -28,7 +27,7 @@ public final class KeepsakeGorgon extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Gorgon creature an opponent controls"); static { filter.add(Predicates.not(SubType.GORGON.getPredicate())); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public KeepsakeGorgon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KefnetsMonument.java b/Mage.Sets/src/mage/cards/k/KefnetsMonument.java index b00ac5a276f..74a36b344ac 100644 --- a/Mage.Sets/src/mage/cards/k/KefnetsMonument.java +++ b/Mage.Sets/src/mage/cards/k/KefnetsMonument.java @@ -19,7 +19,6 @@ import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -39,7 +38,7 @@ public final class KefnetsMonument extends CardImpl { filter2.add(CardType.CREATURE.getPredicate()); } static { - filter3.add(new ControllerPredicate(TargetController.OPPONENT)); + filter3.add(TargetController.OPPONENT.getControllerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/k/KestiaTheCultivator.java b/Mage.Sets/src/mage/cards/k/KestiaTheCultivator.java index fdd5539a29f..aa2ac5fe9bb 100644 --- a/Mage.Sets/src/mage/cards/k/KestiaTheCultivator.java +++ b/Mage.Sets/src/mage/cards/k/KestiaTheCultivator.java @@ -18,7 +18,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.EnchantedPredicate; /** @@ -35,7 +34,7 @@ public final class KestiaTheCultivator extends CardImpl { EnchantedPredicate.instance, CardType.ENCHANTMENT.getPredicate() )); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public KestiaTheCultivator(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KheruBloodsucker.java b/Mage.Sets/src/mage/cards/k/KheruBloodsucker.java index b2ea8324ab3..5fbf308adb2 100644 --- a/Mage.Sets/src/mage/cards/k/KheruBloodsucker.java +++ b/Mage.Sets/src/mage/cards/k/KheruBloodsucker.java @@ -23,7 +23,6 @@ import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ToughnessPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledPermanent; /** @@ -35,7 +34,7 @@ public final class KheruBloodsucker extends CardImpl { private static final FilterCreaturePermanent toughnessFilter = new FilterCreaturePermanent("a creature you control with toughness 4 or greater"); static { - toughnessFilter.add(new ControllerPredicate(TargetController.YOU)); + toughnessFilter.add(TargetController.YOU.getControllerPredicate()); toughnessFilter.add(new ToughnessPredicate(ComparisonType.MORE_THAN, 3)); } diff --git a/Mage.Sets/src/mage/cards/k/KiAdiMundi.java b/Mage.Sets/src/mage/cards/k/KiAdiMundi.java index 63d42793a71..25b76710aee 100644 --- a/Mage.Sets/src/mage/cards/k/KiAdiMundi.java +++ b/Mage.Sets/src/mage/cards/k/KiAdiMundi.java @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -28,7 +27,7 @@ public final class KiAdiMundi extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public KiAdiMundi(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KioraTheCrashingWave.java b/Mage.Sets/src/mage/cards/k/KioraTheCrashingWave.java index e5a92f4eaaf..e1a0323ecb4 100644 --- a/Mage.Sets/src/mage/cards/k/KioraTheCrashingWave.java +++ b/Mage.Sets/src/mage/cards/k/KioraTheCrashingWave.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.command.emblems.KioraEmblem; import mage.game.events.DamageEvent; @@ -35,7 +34,7 @@ public final class KioraTheCrashingWave extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("permanent an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public KioraTheCrashingWave(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KithkinGreatheart.java b/Mage.Sets/src/mage/cards/k/KithkinGreatheart.java index 8ec5942139b..9ff58d8d6fe 100644 --- a/Mage.Sets/src/mage/cards/k/KithkinGreatheart.java +++ b/Mage.Sets/src/mage/cards/k/KithkinGreatheart.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -24,7 +23,7 @@ public final class KithkinGreatheart extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Giant"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.GIANT.getPredicate()); } private static final String rule2 = "As long as you control a Giant, {this} has first strike"; diff --git a/Mage.Sets/src/mage/cards/k/KnightExemplar.java b/Mage.Sets/src/mage/cards/k/KnightExemplar.java index 5b930d3979a..ea3437caa1b 100644 --- a/Mage.Sets/src/mage/cards/k/KnightExemplar.java +++ b/Mage.Sets/src/mage/cards/k/KnightExemplar.java @@ -15,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -43,7 +42,7 @@ public final class KnightExemplar extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); FilterCreaturePermanent indestructibleFilter = filter.copy(); indestructibleFilter.add(AnotherPredicate.instance); - indestructibleFilter.add(new ControllerPredicate(TargetController.YOU)); + indestructibleFilter.add(TargetController.YOU.getControllerPredicate()); indestructibleFilter.setMessage("Other Knight creatures you control"); Effect effect = new GainAbilityAllEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield, indestructibleFilter, false); effect.setText("Other Knight creatures you control are indestructible"); diff --git a/Mage.Sets/src/mage/cards/k/KnuckleboneWitch.java b/Mage.Sets/src/mage/cards/k/KnuckleboneWitch.java index 0bc46e16564..df02ec38bc7 100644 --- a/Mage.Sets/src/mage/cards/k/KnuckleboneWitch.java +++ b/Mage.Sets/src/mage/cards/k/KnuckleboneWitch.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -23,7 +22,7 @@ public final class KnuckleboneWitch extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Goblin you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.GOBLIN.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/k/KoboldTaskmaster.java b/Mage.Sets/src/mage/cards/k/KoboldTaskmaster.java index 0f63c4c7785..e563e4c6efb 100644 --- a/Mage.Sets/src/mage/cards/k/KoboldTaskmaster.java +++ b/Mage.Sets/src/mage/cards/k/KoboldTaskmaster.java @@ -9,7 +9,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -20,7 +19,7 @@ public final class KoboldTaskmaster extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Kobold creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.KOBOLD.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/k/KolaghanTheStormsFury.java b/Mage.Sets/src/mage/cards/k/KolaghanTheStormsFury.java index f78f3d385b9..a196eb72ced 100644 --- a/Mage.Sets/src/mage/cards/k/KolaghanTheStormsFury.java +++ b/Mage.Sets/src/mage/cards/k/KolaghanTheStormsFury.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import static mage.filter.StaticFilters.FILTER_PERMANENT_CREATURES; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -24,7 +23,7 @@ public final class KolaghanTheStormsFury extends CardImpl { static { filter.add(SubType.DRAGON.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public KolaghanTheStormsFury(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KorEntanglers.java b/Mage.Sets/src/mage/cards/k/KorEntanglers.java index 68281bfe4bc..7e51279920f 100644 --- a/Mage.Sets/src/mage/cards/k/KorEntanglers.java +++ b/Mage.Sets/src/mage/cards/k/KorEntanglers.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class KorEntanglers extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public KorEntanglers(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KorHookmaster.java b/Mage.Sets/src/mage/cards/k/KorHookmaster.java index d1264de399a..b74d937d5a8 100644 --- a/Mage.Sets/src/mage/cards/k/KorHookmaster.java +++ b/Mage.Sets/src/mage/cards/k/KorHookmaster.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class KorHookmaster extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public KorHookmaster(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KothOfTheHammer.java b/Mage.Sets/src/mage/cards/k/KothOfTheHammer.java index 39d65d9b78f..f6317d18c67 100644 --- a/Mage.Sets/src/mage/cards/k/KothOfTheHammer.java +++ b/Mage.Sets/src/mage/cards/k/KothOfTheHammer.java @@ -20,7 +20,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.command.emblems.KothOfTheHammerEmblem; import mage.game.permanent.token.TokenImpl; import mage.target.common.TargetLandPermanent; @@ -36,7 +35,7 @@ public final class KothOfTheHammer extends CardImpl { static { filterCount.add(SubType.MOUNTAIN.getPredicate()); - filterCount.add(new ControllerPredicate(TargetController.YOU)); + filterCount.add(TargetController.YOU.getControllerPredicate()); } public KothOfTheHammer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KraulHarpooner.java b/Mage.Sets/src/mage/cards/k/KraulHarpooner.java index 5e63d8ff12c..13c16e28cb3 100644 --- a/Mage.Sets/src/mage/cards/k/KraulHarpooner.java +++ b/Mage.Sets/src/mage/cards/k/KraulHarpooner.java @@ -19,7 +19,6 @@ import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -34,7 +33,7 @@ public final class KraulHarpooner extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("creature with flying you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); filter.add(new AbilityPredicate(FlyingAbility.class)); } diff --git a/Mage.Sets/src/mage/cards/k/KukemssaSerpent.java b/Mage.Sets/src/mage/cards/k/KukemssaSerpent.java index 03ab575ac41..3b0562729ab 100644 --- a/Mage.Sets/src/mage/cards/k/KukemssaSerpent.java +++ b/Mage.Sets/src/mage/cards/k/KukemssaSerpent.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetLandPermanent; @@ -32,7 +31,7 @@ public final class KukemssaSerpent extends CardImpl { private static final FilterControlledLandPermanent filterControlledLand = new FilterControlledLandPermanent("an Island"); static { - filterOpponentLand.add(new ControllerPredicate(TargetController.OPPONENT)); + filterOpponentLand.add(TargetController.OPPONENT.getControllerPredicate()); filterControlledLand.add(SubType.ISLAND.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/k/KulrathKnight.java b/Mage.Sets/src/mage/cards/k/KulrathKnight.java index 44df6d1a19c..44cf06cd25f 100644 --- a/Mage.Sets/src/mage/cards/k/KulrathKnight.java +++ b/Mage.Sets/src/mage/cards/k/KulrathKnight.java @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterAnyPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -55,7 +54,7 @@ class KulrathKnightRestrictionEffect extends RestrictionEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control with counters on them"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filter.add(CounterAnyPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/l/LandbindRitual.java b/Mage.Sets/src/mage/cards/l/LandbindRitual.java index afff0593fd4..95e93caf31c 100644 --- a/Mage.Sets/src/mage/cards/l/LandbindRitual.java +++ b/Mage.Sets/src/mage/cards/l/LandbindRitual.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -22,7 +21,7 @@ public final class LandbindRitual extends CardImpl { static { filter.add(SubType.PLAINS.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public LandbindRitual(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LandoCalrissian.java b/Mage.Sets/src/mage/cards/l/LandoCalrissian.java index 65e5522266b..b5f312bcae1 100644 --- a/Mage.Sets/src/mage/cards/l/LandoCalrissian.java +++ b/Mage.Sets/src/mage/cards/l/LandoCalrissian.java @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -26,7 +25,7 @@ public final class LandoCalrissian extends CardImpl { static { filter.add(SubType.STARSHIP.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public LandoCalrissian(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/Landslide.java b/Mage.Sets/src/mage/cards/l/Landslide.java index fa0bea4bc95..7694cb507c1 100644 --- a/Mage.Sets/src/mage/cards/l/Landslide.java +++ b/Mage.Sets/src/mage/cards/l/Landslide.java @@ -11,7 +11,6 @@ import mage.constants.SubType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -48,7 +47,7 @@ class LandslideEffect extends OneShotEffect { static final FilterPermanent filter = new FilterPermanent("Mountains to sacrifice"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.MOUNTAIN.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/l/Lashwrithe.java b/Mage.Sets/src/mage/cards/l/Lashwrithe.java index c6e10e82994..50f231ee8a6 100644 --- a/Mage.Sets/src/mage/cards/l/Lashwrithe.java +++ b/Mage.Sets/src/mage/cards/l/Lashwrithe.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -24,7 +23,7 @@ public final class Lashwrithe extends CardImpl { static { filter.add(SubType.SWAMP.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public Lashwrithe(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LaviniaOfTheTenth.java b/Mage.Sets/src/mage/cards/l/LaviniaOfTheTenth.java index a26b9e31447..af6af973627 100644 --- a/Mage.Sets/src/mage/cards/l/LaviniaOfTheTenth.java +++ b/Mage.Sets/src/mage/cards/l/LaviniaOfTheTenth.java @@ -18,7 +18,6 @@ import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -28,7 +27,7 @@ public final class LaviniaOfTheTenth extends CardImpl { private static final FilterPermanent filterDetain = new FilterPermanent("each nonland permanent your opponents control with converted mana cost 4 or less"); static { - filterDetain.add(new ControllerPredicate(TargetController.OPPONENT)); + filterDetain.add(TargetController.OPPONENT.getControllerPredicate()); filterDetain.add(Predicates.not(CardType.LAND.getPredicate())); filterDetain.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 5)); } diff --git a/Mage.Sets/src/mage/cards/l/LeagueGuildmage.java b/Mage.Sets/src/mage/cards/l/LeagueGuildmage.java index 885e0d93273..c2028cc50a3 100644 --- a/Mage.Sets/src/mage/cards/l/LeagueGuildmage.java +++ b/Mage.Sets/src/mage/cards/l/LeagueGuildmage.java @@ -17,7 +17,6 @@ import mage.constants.TargetController; import mage.filter.FilterSpell; import mage.filter.common.FilterInstantOrSorcerySpell; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.target.TargetSpell; import mage.target.targetadjustment.TargetAdjuster; @@ -31,7 +30,7 @@ public final class LeagueGuildmage extends CardImpl { private static final FilterSpell filter = new FilterInstantOrSorcerySpell("instant or sorcery you control with converted mana cost X"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public LeagueGuildmage(UUID ownerId, CardSetInfo setInfo) { @@ -78,7 +77,7 @@ enum LeagueGuildmageAdjuster implements TargetAdjuster { public void adjustTargets(Ability ability, Game game) { int xValue = ability.getManaCostsToPay().getX(); FilterSpell spellFilter = new FilterInstantOrSorcerySpell("instant or sorcery you control with converted mana cost " + xValue); - spellFilter.add(new ControllerPredicate(TargetController.YOU)); + spellFilter.add(TargetController.YOU.getControllerPredicate()); spellFilter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue)); ability.getTargets().clear(); ability.addTarget(new TargetSpell(spellFilter)); diff --git a/Mage.Sets/src/mage/cards/l/LedevChampion.java b/Mage.Sets/src/mage/cards/l/LedevChampion.java index babd14a4eb4..108ac4328de 100644 --- a/Mage.Sets/src/mage/cards/l/LedevChampion.java +++ b/Mage.Sets/src/mage/cards/l/LedevChampion.java @@ -19,7 +19,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.token.SoldierLifelinkToken; @@ -67,7 +66,7 @@ class LedevChampionEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/l/LeechingSliver.java b/Mage.Sets/src/mage/cards/l/LeechingSliver.java index 723820f4ceb..df7f3d384d0 100644 --- a/Mage.Sets/src/mage/cards/l/LeechingSliver.java +++ b/Mage.Sets/src/mage/cards/l/LeechingSliver.java @@ -12,7 +12,6 @@ import mage.constants.SetTargetPointer; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @author noxx @@ -22,7 +21,7 @@ public final class LeechingSliver extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Sliver you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.SLIVER.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/l/LegionLieutenant.java b/Mage.Sets/src/mage/cards/l/LegionLieutenant.java index 5be400a6ada..e7f778aabc3 100644 --- a/Mage.Sets/src/mage/cards/l/LegionLieutenant.java +++ b/Mage.Sets/src/mage/cards/l/LegionLieutenant.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class LegionLieutenant extends CardImpl { static { filter.add(SubType.VAMPIRE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public LegionLieutenant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LegionsInitiative.java b/Mage.Sets/src/mage/cards/l/LegionsInitiative.java index 915038619c7..ad9eff62a91 100644 --- a/Mage.Sets/src/mage/cards/l/LegionsInitiative.java +++ b/Mage.Sets/src/mage/cards/l/LegionsInitiative.java @@ -19,7 +19,6 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.ExileZone; import mage.game.Game; import mage.game.permanent.Permanent; @@ -70,7 +69,7 @@ class LegionsInitiativeExileEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterPermanent("all creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(CardType.CREATURE.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/l/LensOfClarity.java b/Mage.Sets/src/mage/cards/l/LensOfClarity.java index 1f0ac790460..1424b8314f1 100644 --- a/Mage.Sets/src/mage/cards/l/LensOfClarity.java +++ b/Mage.Sets/src/mage/cards/l/LensOfClarity.java @@ -18,7 +18,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.other.FaceDownPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -110,7 +109,7 @@ class LensOfClarityLookFaceDownAbility extends ActivatedAbilityImpl { static { filter.add(FaceDownPredicate.instance); - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public LensOfClarityLookFaceDownAbility() { diff --git a/Mage.Sets/src/mage/cards/l/LeoninArmorguard.java b/Mage.Sets/src/mage/cards/l/LeoninArmorguard.java index b64feb12835..4e03c2ff58c 100644 --- a/Mage.Sets/src/mage/cards/l/LeoninArmorguard.java +++ b/Mage.Sets/src/mage/cards/l/LeoninArmorguard.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -23,7 +22,7 @@ public final class LeoninArmorguard extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public LeoninArmorguard(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LeoninIconoclast.java b/Mage.Sets/src/mage/cards/l/LeoninIconoclast.java index c89c4efde79..f5de91e709e 100644 --- a/Mage.Sets/src/mage/cards/l/LeoninIconoclast.java +++ b/Mage.Sets/src/mage/cards/l/LeoninIconoclast.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; /** @@ -26,7 +25,7 @@ public final class LeoninIconoclast extends CardImpl { static { filter.add(CardType.ENCHANTMENT.getPredicate()); filter.add(CardType.CREATURE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public LeoninIconoclast(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LeylineOfSanctity.java b/Mage.Sets/src/mage/cards/l/LeylineOfSanctity.java index 2e85d3caf8b..65187da383f 100644 --- a/Mage.Sets/src/mage/cards/l/LeylineOfSanctity.java +++ b/Mage.Sets/src/mage/cards/l/LeylineOfSanctity.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterStackObject; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -24,7 +23,7 @@ public final class LeylineOfSanctity extends CardImpl { private static final FilterStackObject filter = new FilterStackObject("spells or abilities your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public LeylineOfSanctity(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/Lifeblood.java b/Mage.Sets/src/mage/cards/l/Lifeblood.java index adde86a0da6..85d4f801019 100644 --- a/Mage.Sets/src/mage/cards/l/Lifeblood.java +++ b/Mage.Sets/src/mage/cards/l/Lifeblood.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -22,7 +21,7 @@ public final class Lifeblood extends CardImpl { static { filter.add(SubType.MOUNTAIN.getPredicate()); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public Lifeblood(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LifecraftAwakening.java b/Mage.Sets/src/mage/cards/l/LifecraftAwakening.java index a6ff60b5017..9c3f618df98 100644 --- a/Mage.Sets/src/mage/cards/l/LifecraftAwakening.java +++ b/Mage.Sets/src/mage/cards/l/LifecraftAwakening.java @@ -13,11 +13,9 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.TokenImpl; -import mage.game.permanent.token.Token; import mage.target.common.TargetArtifactPermanent; import mage.target.targetpointer.FixedTarget; @@ -32,7 +30,7 @@ public final class LifecraftAwakening extends CardImpl { private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("artifact you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public LifecraftAwakening(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/Lifetap.java b/Mage.Sets/src/mage/cards/l/Lifetap.java index e37a8b4b174..65692ff550a 100644 --- a/Mage.Sets/src/mage/cards/l/Lifetap.java +++ b/Mage.Sets/src/mage/cards/l/Lifetap.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -22,7 +21,7 @@ public final class Lifetap extends CardImpl { static { filter.add(SubType.FOREST.getPredicate()); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public Lifetap(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LightFromWithin.java b/Mage.Sets/src/mage/cards/l/LightFromWithin.java index 4a9a0f83882..629eb3aef79 100644 --- a/Mage.Sets/src/mage/cards/l/LightFromWithin.java +++ b/Mage.Sets/src/mage/cards/l/LightFromWithin.java @@ -18,7 +18,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -33,7 +32,7 @@ public final class LightFromWithin extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public LightFromWithin(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LightningCoils.java b/Mage.Sets/src/mage/cards/l/LightningCoils.java index 9b290065a0f..b3b8a32f3a0 100644 --- a/Mage.Sets/src/mage/cards/l/LightningCoils.java +++ b/Mage.Sets/src/mage/cards/l/LightningCoils.java @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -31,7 +30,7 @@ public final class LightningCoils extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a nontoken creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.not(TokenPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/l/LilianaDreadhordeGeneral.java b/Mage.Sets/src/mage/cards/l/LilianaDreadhordeGeneral.java index 54b403baaa3..a538d5ada61 100644 --- a/Mage.Sets/src/mage/cards/l/LilianaDreadhordeGeneral.java +++ b/Mage.Sets/src/mage/cards/l/LilianaDreadhordeGeneral.java @@ -17,7 +17,6 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardIdPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.ZombieToken; @@ -86,7 +85,7 @@ class LilianaDreadhordeGeneralEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { FilterPermanent keepFilter = new FilterPermanent(); - keepFilter.add(new ControllerPredicate(TargetController.OPPONENT)); + keepFilter.add(TargetController.OPPONENT.getControllerPredicate()); for (UUID opponentId : game.getState().getPlayersInRange(source.getControllerId(), game)) { Player opponent = game.getPlayer(opponentId); if (opponent == null || !opponent.hasOpponent(source.getControllerId(), game)) { diff --git a/Mage.Sets/src/mage/cards/l/LilianaHereticalHealer.java b/Mage.Sets/src/mage/cards/l/LilianaHereticalHealer.java index 990e7a7b2e1..b068404a75c 100644 --- a/Mage.Sets/src/mage/cards/l/LilianaHereticalHealer.java +++ b/Mage.Sets/src/mage/cards/l/LilianaHereticalHealer.java @@ -18,7 +18,6 @@ import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.ZombieToken; @@ -31,7 +30,7 @@ public final class LilianaHereticalHealer extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another nontoken creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); filter.add(Predicates.not(TokenPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/l/LilianaOfTheDarkRealms.java b/Mage.Sets/src/mage/cards/l/LilianaOfTheDarkRealms.java index 1f64cbb17ea..c0a759a93af 100644 --- a/Mage.Sets/src/mage/cards/l/LilianaOfTheDarkRealms.java +++ b/Mage.Sets/src/mage/cards/l/LilianaOfTheDarkRealms.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandCard; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.command.emblems.LilianaOfTheDarkRealmsEmblem; import mage.game.permanent.Permanent; @@ -86,7 +85,7 @@ class LilianaOfTheDarkRealmsEffect extends ContinuousEffectImpl { FilterLandPermanent filter = new FilterLandPermanent("Swamps"); filter.add(SubType.SWAMP.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); this.amount = game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game); Player player = game.getPlayer(source.getControllerId()); diff --git a/Mage.Sets/src/mage/cards/l/LilianasInfluence.java b/Mage.Sets/src/mage/cards/l/LilianasInfluence.java index 7ba1d7345a5..74aa74a26d1 100644 --- a/Mage.Sets/src/mage/cards/l/LilianasInfluence.java +++ b/Mage.Sets/src/mage/cards/l/LilianasInfluence.java @@ -12,7 +12,6 @@ import mage.counters.CounterType; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class LilianasInfluence extends CardImpl { static { filter.add(new NamePredicate("Liliana, Death Wielder")); - filterCreatures.add(new ControllerPredicate(TargetController.NOT_YOU)); + filterCreatures.add(TargetController.NOT_YOU.getControllerPredicate()); } public LilianasInfluence(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LimDulTheNecromancer.java b/Mage.Sets/src/mage/cards/l/LimDulTheNecromancer.java index 7f75d49f9e0..b5086823903 100644 --- a/Mage.Sets/src/mage/cards/l/LimDulTheNecromancer.java +++ b/Mage.Sets/src/mage/cards/l/LimDulTheNecromancer.java @@ -18,7 +18,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -35,7 +34,7 @@ public final class LimDulTheNecromancer extends CardImpl { private static final FilterPermanent filter2 = new FilterPermanent("Zombie"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filter2.add(SubType.ZOMBIE.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java b/Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java index 8bb18a151df..cbee45d53f8 100644 --- a/Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java +++ b/Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java @@ -16,7 +16,6 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; @@ -32,7 +31,7 @@ public final class LlawanCephalidEmpress extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.BLUE)); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filter.add(CardType.CREATURE.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/l/LoathsomeCatoblepas.java b/Mage.Sets/src/mage/cards/l/LoathsomeCatoblepas.java index 2fbc3f8bdd6..ad78c80979c 100644 --- a/Mage.Sets/src/mage/cards/l/LoathsomeCatoblepas.java +++ b/Mage.Sets/src/mage/cards/l/LoathsomeCatoblepas.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; @@ -29,7 +28,7 @@ public final class LoathsomeCatoblepas extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public LoathsomeCatoblepas(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LongshotSquad.java b/Mage.Sets/src/mage/cards/l/LongshotSquad.java index 0b93b7a84b4..42676ccb5b4 100644 --- a/Mage.Sets/src/mage/cards/l/LongshotSquad.java +++ b/Mage.Sets/src/mage/cards/l/LongshotSquad.java @@ -17,7 +17,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; /** @@ -30,7 +29,7 @@ public final class LongshotSquad extends CardImpl { static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(new CounterPredicate(CounterType.P1P1)); } diff --git a/Mage.Sets/src/mage/cards/l/LowlandOaf.java b/Mage.Sets/src/mage/cards/l/LowlandOaf.java index 4a310f71890..b6e538ff92a 100644 --- a/Mage.Sets/src/mage/cards/l/LowlandOaf.java +++ b/Mage.Sets/src/mage/cards/l/LowlandOaf.java @@ -18,7 +18,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -34,7 +33,7 @@ public final class LowlandOaf extends CardImpl { static { filter.add(SubType.GOBLIN.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public LowlandOaf(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LoxodonHierarch.java b/Mage.Sets/src/mage/cards/l/LoxodonHierarch.java index fc03a6ce2e5..55b531e2140 100644 --- a/Mage.Sets/src/mage/cards/l/LoxodonHierarch.java +++ b/Mage.Sets/src/mage/cards/l/LoxodonHierarch.java @@ -14,11 +14,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.StaticFilters; -import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/l/LoyalGyrfalcon.java b/Mage.Sets/src/mage/cards/l/LoyalGyrfalcon.java index df11aa379f6..cd8c95f92bd 100644 --- a/Mage.Sets/src/mage/cards/l/LoyalGyrfalcon.java +++ b/Mage.Sets/src/mage/cards/l/LoyalGyrfalcon.java @@ -16,7 +16,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -28,7 +27,7 @@ public final class LoyalGyrfalcon extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.WHITE)); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } private static final String rule = "Whenever you cast a white spell, {this} loses defender until end of turn."; diff --git a/Mage.Sets/src/mage/cards/l/LurkingChupacabra.java b/Mage.Sets/src/mage/cards/l/LurkingChupacabra.java index 1e31686f73b..f82da3743ee 100644 --- a/Mage.Sets/src/mage/cards/l/LurkingChupacabra.java +++ b/Mage.Sets/src/mage/cards/l/LurkingChupacabra.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -25,7 +24,7 @@ public final class LurkingChupacabra extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public LurkingChupacabra(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LyevDecree.java b/Mage.Sets/src/mage/cards/l/LyevDecree.java index 66c37e1c548..d878e9a56b0 100644 --- a/Mage.Sets/src/mage/cards/l/LyevDecree.java +++ b/Mage.Sets/src/mage/cards/l/LyevDecree.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; @@ -23,7 +22,7 @@ public final class LyevDecree extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public LyevDecree(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LyevSkyknight.java b/Mage.Sets/src/mage/cards/l/LyevSkyknight.java index 7005f91c6ae..be427f1a576 100644 --- a/Mage.Sets/src/mage/cards/l/LyevSkyknight.java +++ b/Mage.Sets/src/mage/cards/l/LyevSkyknight.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetNonlandPermanent; /** @@ -25,7 +24,7 @@ public final class LyevSkyknight extends CardImpl { private static final FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanent an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public LyevSkyknight(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MaceWindu.java b/Mage.Sets/src/mage/cards/m/MaceWindu.java index 5cea0fd71ba..86004024748 100644 --- a/Mage.Sets/src/mage/cards/m/MaceWindu.java +++ b/Mage.Sets/src/mage/cards/m/MaceWindu.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterSpellOrPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetSpellOrPermanent; /** @@ -27,7 +26,7 @@ public final class MaceWindu extends CardImpl { private static final FilterSpellOrPermanent filter = new FilterSpellOrPermanent("spell or creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public MaceWindu(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MaddeningImp.java b/Mage.Sets/src/mage/cards/m/MaddeningImp.java index 198b006fb95..c23a0df4b0a 100644 --- a/Mage.Sets/src/mage/cards/m/MaddeningImp.java +++ b/Mage.Sets/src/mage/cards/m/MaddeningImp.java @@ -21,7 +21,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -37,7 +36,7 @@ public final class MaddeningImp extends CardImpl { static { filter.add(Predicates.not(SubType.WALL.getPredicate())); - filter.add(new ControllerPredicate(TargetController.ACTIVE)); + filter.add(TargetController.ACTIVE.getControllerPredicate()); filter.setMessage("non-Wall creatures the active player controls"); } @@ -91,7 +90,7 @@ class MaddeningImpCreateDelayedTriggeredAbilityEffect extends OneShotEffect { static { filter.add(Predicates.not(SubType.WALL.getPredicate())); - filter.add(new ControllerPredicate(TargetController.ACTIVE)); + filter.add(TargetController.ACTIVE.getControllerPredicate()); } public MaddeningImpCreateDelayedTriggeredAbilityEffect() { diff --git a/Mage.Sets/src/mage/cards/m/MaelstromWanderer.java b/Mage.Sets/src/mage/cards/m/MaelstromWanderer.java index 83c0f609ded..40da59efdc1 100644 --- a/Mage.Sets/src/mage/cards/m/MaelstromWanderer.java +++ b/Mage.Sets/src/mage/cards/m/MaelstromWanderer.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -22,7 +21,7 @@ public final class MaelstromWanderer extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public MaelstromWanderer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheUnseen.java b/Mage.Sets/src/mage/cards/m/MagusOfTheUnseen.java index 8d2787eb306..737301cf1c7 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheUnseen.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheUnseen.java @@ -23,7 +23,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -37,7 +36,7 @@ public final class MagusOfTheUnseen extends CardImpl { private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("artifact an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public MagusOfTheUnseen(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MalakirCullblade.java b/Mage.Sets/src/mage/cards/m/MalakirCullblade.java index bf1b64ca628..0e638ba148f 100644 --- a/Mage.Sets/src/mage/cards/m/MalakirCullblade.java +++ b/Mage.Sets/src/mage/cards/m/MalakirCullblade.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -23,7 +22,7 @@ public final class MalakirCullblade extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public MalakirCullblade(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/ManaGeyser.java b/Mage.Sets/src/mage/cards/m/ManaGeyser.java index 1069b455208..b10e23a00dc 100644 --- a/Mage.Sets/src/mage/cards/m/ManaGeyser.java +++ b/Mage.Sets/src/mage/cards/m/ManaGeyser.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; /** @@ -22,7 +21,7 @@ public final class ManaGeyser extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("tapped land your opponents control"); static { filter.add(TappedPredicate.instance); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ManaGeyser(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{R}{R}"); diff --git a/Mage.Sets/src/mage/cards/m/MaraudingKnight.java b/Mage.Sets/src/mage/cards/m/MaraudingKnight.java index c97407beb24..cccf4960396 100644 --- a/Mage.Sets/src/mage/cards/m/MaraudingKnight.java +++ b/Mage.Sets/src/mage/cards/m/MaraudingKnight.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -23,7 +22,7 @@ public final class MaraudingKnight extends CardImpl { private static final FilterLandPermanent plainsFilter = new FilterLandPermanent("Plains your opponent controls"); static { plainsFilter.add(SubType.PLAINS.getPredicate()); - plainsFilter.add(new ControllerPredicate(TargetController.OPPONENT)); + plainsFilter.add(TargetController.OPPONENT.getControllerPredicate()); } public MaraudingKnight(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MarduAscendancy.java b/Mage.Sets/src/mage/cards/m/MarduAscendancy.java index d821628d156..432aa1ced79 100644 --- a/Mage.Sets/src/mage/cards/m/MarduAscendancy.java +++ b/Mage.Sets/src/mage/cards/m/MarduAscendancy.java @@ -16,7 +16,6 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.GoblinToken; @@ -31,7 +30,7 @@ public final class MarduAscendancy extends CardImpl { static { attackFilter.add(Predicates.not(TokenPredicate.instance)); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public MarduAscendancy(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MarkForDeath.java b/Mage.Sets/src/mage/cards/m/MarkForDeath.java index d7df1a877e7..4dada3d695e 100644 --- a/Mage.Sets/src/mage/cards/m/MarkForDeath.java +++ b/Mage.Sets/src/mage/cards/m/MarkForDeath.java @@ -17,7 +17,6 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardIdPredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -32,7 +31,7 @@ public final class MarkForDeath extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public MarkForDeath(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MarshalingTheTroops.java b/Mage.Sets/src/mage/cards/m/MarshalingTheTroops.java index ac37de8471c..6380d6d05f8 100644 --- a/Mage.Sets/src/mage/cards/m/MarshalingTheTroops.java +++ b/Mage.Sets/src/mage/cards/m/MarshalingTheTroops.java @@ -14,7 +14,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.players.Player; @@ -48,7 +47,7 @@ class MarshalingTheTroopsEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/m/MarshdrinkerGiant.java b/Mage.Sets/src/mage/cards/m/MarshdrinkerGiant.java index 62a3b227167..9783add5687 100644 --- a/Mage.Sets/src/mage/cards/m/MarshdrinkerGiant.java +++ b/Mage.Sets/src/mage/cards/m/MarshdrinkerGiant.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetLandPermanent; /** @@ -28,7 +27,7 @@ public final class MarshdrinkerGiant extends CardImpl { filter.add(Predicates.or( SubType.ISLAND.getPredicate(), SubType.SWAMP.getPredicate())); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public MarshdrinkerGiant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MartialLaw.java b/Mage.Sets/src/mage/cards/m/MartialLaw.java index 00e3c991919..f45f850bf15 100644 --- a/Mage.Sets/src/mage/cards/m/MartialLaw.java +++ b/Mage.Sets/src/mage/cards/m/MartialLaw.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -21,7 +20,7 @@ public final class MartialLaw extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public MartialLaw(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MasterOfEtherium.java b/Mage.Sets/src/mage/cards/m/MasterOfEtherium.java index a0da161a7e7..a7fd0126c13 100644 --- a/Mage.Sets/src/mage/cards/m/MasterOfEtherium.java +++ b/Mage.Sets/src/mage/cards/m/MasterOfEtherium.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -26,7 +25,7 @@ public final class MasterOfEtherium extends CardImpl { static { filterCounted.add(CardType.ARTIFACT.getPredicate()); filterBoosted.add(CardType.ARTIFACT.getPredicate()); - filterBoosted.add(new ControllerPredicate(TargetController.YOU)); + filterBoosted.add(TargetController.YOU.getControllerPredicate()); } public MasterOfEtherium(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MasterWarcraft.java b/Mage.Sets/src/mage/cards/m/MasterWarcraft.java index 3fabd6af7e9..be36268265f 100644 --- a/Mage.Sets/src/mage/cards/m/MasterWarcraft.java +++ b/Mage.Sets/src/mage/cards/m/MasterWarcraft.java @@ -2,16 +2,14 @@ package mage.cards.m; import java.util.*; -import mage.MageObject; + import mage.abilities.Ability; -import mage.abilities.Mode; import mage.abilities.common.CastOnlyDuringPhaseStepSourceAbility; import mage.abilities.condition.common.BeforeAttackersAreDeclaredCondition; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.RequirementEffect; import mage.abilities.effects.RestrictionEffect; -import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.combat.AttacksIfAbleTargetEffect; import mage.abilities.effects.common.combat.CantAttackTargetEffect; import mage.cards.CardImpl; @@ -20,14 +18,10 @@ import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; -import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; -import mage.game.stack.Spell; import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.targetpointer.FixedTarget; import mage.watchers.Watcher; import mage.watchers.common.ChooseBlockersRedundancyWatcher; @@ -124,7 +118,7 @@ class MasterWarcraftChooseAttackersEffect extends ContinuousRuleModifyingEffectI private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures that will attack this combat (creatures not chosen won't attack this combat)"); static { - filter.add(new ControllerPredicate(TargetController.ACTIVE)); + filter.add(TargetController.ACTIVE.getControllerPredicate()); } public MasterWarcraftChooseAttackersEffect() { diff --git a/Mage.Sets/src/mage/cards/m/MathasFiendSeeker.java b/Mage.Sets/src/mage/cards/m/MathasFiendSeeker.java index 0df53297493..97ef3aca9a8 100644 --- a/Mage.Sets/src/mage/cards/m/MathasFiendSeeker.java +++ b/Mage.Sets/src/mage/cards/m/MathasFiendSeeker.java @@ -22,7 +22,6 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -38,7 +37,7 @@ public final class MathasFiendSeeker extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public MathasFiendSeeker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MausoleumHarpy.java b/Mage.Sets/src/mage/cards/m/MausoleumHarpy.java index e1e100f8d9e..8ee3b43842f 100644 --- a/Mage.Sets/src/mage/cards/m/MausoleumHarpy.java +++ b/Mage.Sets/src/mage/cards/m/MausoleumHarpy.java @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -29,7 +28,7 @@ public final class MausoleumHarpy extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public MausoleumHarpy(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MausoleumWanderer.java b/Mage.Sets/src/mage/cards/m/MausoleumWanderer.java index dc090aa29e5..cb65d73e0da 100644 --- a/Mage.Sets/src/mage/cards/m/MausoleumWanderer.java +++ b/Mage.Sets/src/mage/cards/m/MausoleumWanderer.java @@ -17,7 +17,6 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterInstantOrSorcerySpell; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetSpell; /** @@ -29,7 +28,7 @@ public final class MausoleumWanderer extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("another Spirit"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); filter.add(SubType.SPIRIT.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/m/MavrenFeinDuskApostle.java b/Mage.Sets/src/mage/cards/m/MavrenFeinDuskApostle.java index 792b98107c6..11be2bfeb52 100644 --- a/Mage.Sets/src/mage/cards/m/MavrenFeinDuskApostle.java +++ b/Mage.Sets/src/mage/cards/m/MavrenFeinDuskApostle.java @@ -14,7 +14,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -57,7 +56,7 @@ class MavrenFeinDuskApostleTriggeredAbility extends TriggeredAbilityImpl { static { filter.add(SubType.VAMPIRE.getPredicate()); filter.add(Predicates.not(TokenPredicate.instance)); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public MavrenFeinDuskApostleTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/m/MawOfTheObzedat.java b/Mage.Sets/src/mage/cards/m/MawOfTheObzedat.java index ba4a431582c..d52064b0a5e 100644 --- a/Mage.Sets/src/mage/cards/m/MawOfTheObzedat.java +++ b/Mage.Sets/src/mage/cards/m/MawOfTheObzedat.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -23,7 +22,7 @@ public final class MawOfTheObzedat extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public MawOfTheObzedat(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MengHuoBarbarianKing.java b/Mage.Sets/src/mage/cards/m/MengHuoBarbarianKing.java index f69e77d91e6..f892d684fda 100644 --- a/Mage.Sets/src/mage/cards/m/MengHuoBarbarianKing.java +++ b/Mage.Sets/src/mage/cards/m/MengHuoBarbarianKing.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -23,7 +22,7 @@ public final class MengHuoBarbarianKing extends CardImpl { static { filterGreen.add(new ColorPredicate(ObjectColor.GREEN)); - filterGreen.add(new ControllerPredicate(TargetController.YOU)); + filterGreen.add(TargetController.YOU.getControllerPredicate()); } public MengHuoBarbarianKing(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MephidrossVampire.java b/Mage.Sets/src/mage/cards/m/MephidrossVampire.java index 8c6ebba0630..e782a5f8889 100644 --- a/Mage.Sets/src/mage/cards/m/MephidrossVampire.java +++ b/Mage.Sets/src/mage/cards/m/MephidrossVampire.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -54,7 +53,7 @@ class MephidrossVampireEffect extends ContinuousEffectImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } MephidrossVampireEffect() { diff --git a/Mage.Sets/src/mage/cards/m/MerEkNightblade.java b/Mage.Sets/src/mage/cards/m/MerEkNightblade.java index 3c48835cac4..b90a31ddfd0 100644 --- a/Mage.Sets/src/mage/cards/m/MerEkNightblade.java +++ b/Mage.Sets/src/mage/cards/m/MerEkNightblade.java @@ -17,7 +17,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; /** @@ -29,7 +28,7 @@ public final class MerEkNightblade extends CardImpl { private static final FilterPermanent filter = new FilterPermanent(); static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(new CounterPredicate(CounterType.P1P1)); } diff --git a/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java b/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java index 0e1dfd36cbb..ca3045c93f3 100644 --- a/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java +++ b/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java @@ -17,7 +17,6 @@ import mage.counters.CounterType; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.players.Player; import mage.target.Target; @@ -33,7 +32,7 @@ public final class MerenOfClanNelToth extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public MerenOfClanNelToth(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MerfolkMistbinder.java b/Mage.Sets/src/mage/cards/m/MerfolkMistbinder.java index a995467737f..f8fb14feb04 100644 --- a/Mage.Sets/src/mage/cards/m/MerfolkMistbinder.java +++ b/Mage.Sets/src/mage/cards/m/MerfolkMistbinder.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class MerfolkMistbinder extends CardImpl { static { filter.add(SubType.MERFOLK.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public MerfolkMistbinder(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MerrowReejerey.java b/Mage.Sets/src/mage/cards/m/MerrowReejerey.java index 7ee84afcea2..e77a9bd23e5 100644 --- a/Mage.Sets/src/mage/cards/m/MerrowReejerey.java +++ b/Mage.Sets/src/mage/cards/m/MerrowReejerey.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.TargetPermanent; @@ -28,7 +27,7 @@ public final class MerrowReejerey extends CardImpl { static { filter1.add(SubType.MERFOLK.getPredicate()); - filter1.add(new ControllerPredicate(TargetController.YOU)); + filter1.add(TargetController.YOU.getControllerPredicate()); filter2.add(SubType.MERFOLK.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/m/Metamorphose.java b/Mage.Sets/src/mage/cards/m/Metamorphose.java index 1441c1fe1bf..ab78e2ef567 100644 --- a/Mage.Sets/src/mage/cards/m/Metamorphose.java +++ b/Mage.Sets/src/mage/cards/m/Metamorphose.java @@ -15,7 +15,6 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -31,7 +30,7 @@ public final class Metamorphose extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("permanent an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public Metamorphose(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MeteorGolem.java b/Mage.Sets/src/mage/cards/m/MeteorGolem.java index 7ddbb6af77f..e097a938a4c 100644 --- a/Mage.Sets/src/mage/cards/m/MeteorGolem.java +++ b/Mage.Sets/src/mage/cards/m/MeteorGolem.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; /** @@ -23,7 +22,7 @@ public final class MeteorGolem extends CardImpl { private static final FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanent an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public MeteorGolem(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MidnightEntourage.java b/Mage.Sets/src/mage/cards/m/MidnightEntourage.java index 3c755aac022..db32e781008 100644 --- a/Mage.Sets/src/mage/cards/m/MidnightEntourage.java +++ b/Mage.Sets/src/mage/cards/m/MidnightEntourage.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -25,7 +24,7 @@ public final class MidnightEntourage extends CardImpl { static { filter.add(SubType.AETHERBORN.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public MidnightEntourage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MidnightReaper.java b/Mage.Sets/src/mage/cards/m/MidnightReaper.java index cfe9c74eb99..e4d018dc629 100644 --- a/Mage.Sets/src/mage/cards/m/MidnightReaper.java +++ b/Mage.Sets/src/mage/cards/m/MidnightReaper.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; /** @@ -26,7 +25,7 @@ public final class MidnightReaper extends CardImpl { = new FilterCreaturePermanent("nontoken creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.not(TokenPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/m/MightMakesRight.java b/Mage.Sets/src/mage/cards/m/MightMakesRight.java index 3054b42de96..66d4a1dfc53 100644 --- a/Mage.Sets/src/mage/cards/m/MightMakesRight.java +++ b/Mage.Sets/src/mage/cards/m/MightMakesRight.java @@ -18,7 +18,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -34,7 +33,7 @@ public final class MightMakesRight extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public MightMakesRight(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MindSludge.java b/Mage.Sets/src/mage/cards/m/MindSludge.java index d8d10a9115d..931b28fcbe1 100644 --- a/Mage.Sets/src/mage/cards/m/MindSludge.java +++ b/Mage.Sets/src/mage/cards/m/MindSludge.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPlayer; /** @@ -23,7 +22,7 @@ public final class MindSludge extends CardImpl { static { filter.add(SubType.SWAMP.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public MindSludge(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MindwrackLiege.java b/Mage.Sets/src/mage/cards/m/MindwrackLiege.java index 72afb501f57..36b793d8cdf 100644 --- a/Mage.Sets/src/mage/cards/m/MindwrackLiege.java +++ b/Mage.Sets/src/mage/cards/m/MindwrackLiege.java @@ -20,7 +20,6 @@ import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -35,9 +34,9 @@ public final class MindwrackLiege extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.BLUE)); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter2.add(new ColorPredicate(ObjectColor.RED)); - filter2.add(new ControllerPredicate(TargetController.YOU)); + filter2.add(TargetController.YOU.getControllerPredicate()); filter3.add(Predicates.or(new ColorPredicate(ObjectColor.BLUE), new ColorPredicate(ObjectColor.RED))); } diff --git a/Mage.Sets/src/mage/cards/m/MinisterOfPain.java b/Mage.Sets/src/mage/cards/m/MinisterOfPain.java index 113046e7118..adaff0e7990 100644 --- a/Mage.Sets/src/mage/cards/m/MinisterOfPain.java +++ b/Mage.Sets/src/mage/cards/m/MinisterOfPain.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -24,7 +23,7 @@ public final class MinisterOfPain extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public MinisterOfPain(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MiresToll.java b/Mage.Sets/src/mage/cards/m/MiresToll.java index 226c5ed6a75..3a6820a299a 100644 --- a/Mage.Sets/src/mage/cards/m/MiresToll.java +++ b/Mage.Sets/src/mage/cards/m/MiresToll.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPlayer; /** @@ -23,7 +22,7 @@ public final class MiresToll extends CardImpl { static { filter.add(SubType.SWAMP.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public MiresToll(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/Mirrorpool.java b/Mage.Sets/src/mage/cards/m/Mirrorpool.java index a80322a94a6..58da54530b5 100644 --- a/Mage.Sets/src/mage/cards/m/Mirrorpool.java +++ b/Mage.Sets/src/mage/cards/m/Mirrorpool.java @@ -19,7 +19,6 @@ import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetSpell; import mage.target.common.TargetControlledCreaturePermanent; @@ -35,7 +34,7 @@ public final class Mirrorpool extends CardImpl { filter.add(Predicates.or( CardType.INSTANT.getPredicate(), CardType.SORCERY.getPredicate())); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public Mirrorpool(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MizziumMortars.java b/Mage.Sets/src/mage/cards/m/MizziumMortars.java index 04883f5d00e..20aa10d60ce 100644 --- a/Mage.Sets/src/mage/cards/m/MizziumMortars.java +++ b/Mage.Sets/src/mage/cards/m/MizziumMortars.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -22,7 +21,7 @@ public final class MizziumMortars extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public MizziumMortars(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MizziumSkin.java b/Mage.Sets/src/mage/cards/m/MizziumSkin.java index 909ffd2919c..f466540e613 100644 --- a/Mage.Sets/src/mage/cards/m/MizziumSkin.java +++ b/Mage.Sets/src/mage/cards/m/MizziumSkin.java @@ -13,10 +13,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.constants.TargetController; import mage.filter.StaticFilters; -import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/m/MobilizedDistrict.java b/Mage.Sets/src/mage/cards/m/MobilizedDistrict.java index 7ccf90a1b14..999d0ae767c 100644 --- a/Mage.Sets/src/mage/cards/m/MobilizedDistrict.java +++ b/Mage.Sets/src/mage/cards/m/MobilizedDistrict.java @@ -17,7 +17,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.token.TokenImpl; import mage.players.Player; @@ -34,7 +33,7 @@ public final class MobilizedDistrict extends CardImpl { static { filter.add(SuperType.LEGENDARY.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } static final DynamicValue cardsCount = new PermanentsOnBattlefieldCount(filter); diff --git a/Mage.Sets/src/mage/cards/m/MoonlightHunt.java b/Mage.Sets/src/mage/cards/m/MoonlightHunt.java index 4df4ab4481b..a2c39505f9b 100644 --- a/Mage.Sets/src/mage/cards/m/MoonlightHunt.java +++ b/Mage.Sets/src/mage/cards/m/MoonlightHunt.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -27,7 +26,7 @@ public final class MoonlightHunt extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public MoonlightHunt(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MoonlitScavengers.java b/Mage.Sets/src/mage/cards/m/MoonlitScavengers.java index e3a38722921..f815eff2197 100644 --- a/Mage.Sets/src/mage/cards/m/MoonlitScavengers.java +++ b/Mage.Sets/src/mage/cards/m/MoonlitScavengers.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetOpponentsCreaturePermanent; import java.util.UUID; @@ -27,7 +26,7 @@ public final class MoonlitScavengers extends CardImpl { private static final FilterPermanent filter = new FilterArtifactOrEnchantmentPermanent(); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } private static final Condition condition = new PermanentsOnTheBattlefieldCondition(filter); diff --git a/Mage.Sets/src/mage/cards/m/MorophonTheBoundless.java b/Mage.Sets/src/mage/cards/m/MorophonTheBoundless.java index 7be7ed27aa5..c8064c745c5 100644 --- a/Mage.Sets/src/mage/cards/m/MorophonTheBoundless.java +++ b/Mage.Sets/src/mage/cards/m/MorophonTheBoundless.java @@ -14,7 +14,6 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ChosenSubtypePredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -29,7 +28,7 @@ public final class MorophonTheBoundless extends CardImpl { static { filter.add(ChosenSubtypePredicate.instance); - filter2.add(new ControllerPredicate(TargetController.YOU)); + filter2.add(TargetController.YOU.getControllerPredicate()); } public MorophonTheBoundless(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MuYanling.java b/Mage.Sets/src/mage/cards/m/MuYanling.java index f44cd02c010..ea04edb9fbf 100644 --- a/Mage.Sets/src/mage/cards/m/MuYanling.java +++ b/Mage.Sets/src/mage/cards/m/MuYanling.java @@ -17,7 +17,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -63,7 +62,7 @@ class MuYanlingEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public MuYanlingEffect() { diff --git a/Mage.Sets/src/mage/cards/m/MuYanlingCelestialWind.java b/Mage.Sets/src/mage/cards/m/MuYanlingCelestialWind.java index 07092fc2257..709b92c774a 100644 --- a/Mage.Sets/src/mage/cards/m/MuYanlingCelestialWind.java +++ b/Mage.Sets/src/mage/cards/m/MuYanlingCelestialWind.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -26,7 +25,7 @@ public final class MuYanlingCelestialWind extends CardImpl { static { filter.add(new AbilityPredicate(FlyingAbility.class)); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public MuYanlingCelestialWind(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MunitionsExpert.java b/Mage.Sets/src/mage/cards/m/MunitionsExpert.java index d961c48e8a1..6704eab91f5 100644 --- a/Mage.Sets/src/mage/cards/m/MunitionsExpert.java +++ b/Mage.Sets/src/mage/cards/m/MunitionsExpert.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreatureOrPlaneswalker; import java.util.UUID; @@ -26,7 +25,7 @@ public final class MunitionsExpert extends CardImpl { private static final FilterPermanent filter = new FilterPermanent(SubType.GOBLIN, "Goblins you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } private static final DynamicValue xValue = new PermanentsOnBattlefieldCount(filter); diff --git a/Mage.Sets/src/mage/cards/m/MurasaPyromancer.java b/Mage.Sets/src/mage/cards/m/MurasaPyromancer.java index 310a32905b1..ff6903199ca 100644 --- a/Mage.Sets/src/mage/cards/m/MurasaPyromancer.java +++ b/Mage.Sets/src/mage/cards/m/MurasaPyromancer.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -26,7 +25,7 @@ public final class MurasaPyromancer extends CardImpl { static { filter.add(SubType.ALLY.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public MurasaPyromancer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MutantsPrey.java b/Mage.Sets/src/mage/cards/m/MutantsPrey.java index ac7fbe0609a..7d3f445f4b1 100644 --- a/Mage.Sets/src/mage/cards/m/MutantsPrey.java +++ b/Mage.Sets/src/mage/cards/m/MutantsPrey.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; import mage.target.common.TargetCreaturePermanent; @@ -25,9 +24,9 @@ public final class MutantsPrey extends CardImpl { private static final FilterCreaturePermanent filter1 = new FilterCreaturePermanent("creature you control with a +1/+1 counter on it"); private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creature an opponent controls"); static { - filter1.add(new ControllerPredicate(TargetController.YOU)); + filter1.add(TargetController.YOU.getControllerPredicate()); filter1.add(new CounterPredicate(CounterType.P1P1)); - filter2.add(new ControllerPredicate(TargetController.OPPONENT)); + filter2.add(TargetController.OPPONENT.getControllerPredicate()); } public MutantsPrey(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/Mutilate.java b/Mage.Sets/src/mage/cards/m/Mutilate.java index a37e66e33d6..05ade8aba50 100644 --- a/Mage.Sets/src/mage/cards/m/Mutilate.java +++ b/Mage.Sets/src/mage/cards/m/Mutilate.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -28,7 +27,7 @@ public final class Mutilate extends CardImpl { static { filter.add(SubType.SWAMP.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public Mutilate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/Mutiny.java b/Mage.Sets/src/mage/cards/m/Mutiny.java index fc107865415..6e8e5b69eb7 100644 --- a/Mage.Sets/src/mage/cards/m/Mutiny.java +++ b/Mage.Sets/src/mage/cards/m/Mutiny.java @@ -13,7 +13,6 @@ import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.ControllerIdPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.PermanentIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -29,7 +28,7 @@ public final class Mutiny extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public Mutiny(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfSeeingWinds.java b/Mage.Sets/src/mage/cards/m/MyojinOfSeeingWinds.java index 3995ac2cd1c..a2ffdec4737 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfSeeingWinds.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfSeeingWinds.java @@ -22,7 +22,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.watchers.common.CastFromHandWatcher; /** @@ -32,7 +31,7 @@ public final class MyojinOfSeeingWinds extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("permanent you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public MyojinOfSeeingWinds(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MystifyingMaze.java b/Mage.Sets/src/mage/cards/m/MystifyingMaze.java index aa7b7a5dc33..a496ebf1300 100644 --- a/Mage.Sets/src/mage/cards/m/MystifyingMaze.java +++ b/Mage.Sets/src/mage/cards/m/MystifyingMaze.java @@ -19,7 +19,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -34,7 +33,7 @@ public final class MystifyingMaze extends CardImpl { private static final FilterAttackingCreature filter = new FilterAttackingCreature("attacking creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public MystifyingMaze(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 99cfc8958da..d5ffc3fc4fc 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.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -70,7 +69,7 @@ class NamelessRaceEffect extends OneShotEffect { static { filter.add(new ColorPredicate(ObjectColor.WHITE)); filter.add(Predicates.not(TokenPredicate.instance)); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filter2.add(new ColorPredicate(ObjectColor.WHITE)); filter2.add(TargetController.OPPONENT.getOwnerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/n/NantukoBlightcutter.java b/Mage.Sets/src/mage/cards/n/NantukoBlightcutter.java index 9cc4bb53915..aacc2ed1a5d 100644 --- a/Mage.Sets/src/mage/cards/n/NantukoBlightcutter.java +++ b/Mage.Sets/src/mage/cards/n/NantukoBlightcutter.java @@ -21,7 +21,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -33,7 +32,7 @@ public final class NantukoBlightcutter extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.BLACK)); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public NantukoBlightcutter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NaruMehaMasterWizard.java b/Mage.Sets/src/mage/cards/n/NaruMehaMasterWizard.java index f042edccaea..c49db408d94 100644 --- a/Mage.Sets/src/mage/cards/n/NaruMehaMasterWizard.java +++ b/Mage.Sets/src/mage/cards/n/NaruMehaMasterWizard.java @@ -21,7 +21,6 @@ import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetSpell; /** @@ -34,8 +33,8 @@ public final class NaruMehaMasterWizard extends CardImpl { private static final FilterCreaturePermanent wizardFilter = new FilterCreaturePermanent(SubType.WIZARD, "Wizards"); static { - wizardFilter.add(new ControllerPredicate(TargetController.YOU)); - spellFilter.add(new ControllerPredicate(TargetController.YOU)); + wizardFilter.add(TargetController.YOU.getControllerPredicate()); + spellFilter.add(TargetController.YOU.getControllerPredicate()); spellFilter.add(Predicates.or( CardType.INSTANT.getPredicate(), CardType.SORCERY.getPredicate() diff --git a/Mage.Sets/src/mage/cards/n/NaturesWay.java b/Mage.Sets/src/mage/cards/n/NaturesWay.java index ce8752367ca..3f76b3167d2 100644 --- a/Mage.Sets/src/mage/cards/n/NaturesWay.java +++ b/Mage.Sets/src/mage/cards/n/NaturesWay.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -26,7 +25,7 @@ public final class NaturesWay extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public NaturesWay(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NazahnReveredBladesmith.java b/Mage.Sets/src/mage/cards/n/NazahnReveredBladesmith.java index cabe06d449a..6e5be1b840c 100644 --- a/Mage.Sets/src/mage/cards/n/NazahnReveredBladesmith.java +++ b/Mage.Sets/src/mage/cards/n/NazahnReveredBladesmith.java @@ -18,7 +18,6 @@ import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.EquippedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -37,7 +36,7 @@ public final class NazahnReveredBladesmith extends CardImpl { static { equippedFilter.add(EquippedPredicate.instance); - equippedFilter.add(new ControllerPredicate(TargetController.YOU)); + equippedFilter.add(TargetController.YOU.getControllerPredicate()); } private static final FilterCard filter = new FilterCard("Equipment card"); diff --git a/Mage.Sets/src/mage/cards/n/NebelgastHerald.java b/Mage.Sets/src/mage/cards/n/NebelgastHerald.java index 69d68b2586a..833bae9953b 100644 --- a/Mage.Sets/src/mage/cards/n/NebelgastHerald.java +++ b/Mage.Sets/src/mage/cards/n/NebelgastHerald.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -28,9 +27,9 @@ public final class NebelgastHerald extends CardImpl { private static final FilterCreaturePermanent filterTarget = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.SPIRIT.getPredicate()); - filterTarget.add(new ControllerPredicate(TargetController.OPPONENT)); + filterTarget.add(TargetController.OPPONENT.getControllerPredicate()); } public NebelgastHerald(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NecromancersMagemark.java b/Mage.Sets/src/mage/cards/n/NecromancersMagemark.java index 1be965cbc83..3fb52fc0f26 100644 --- a/Mage.Sets/src/mage/cards/n/NecromancersMagemark.java +++ b/Mage.Sets/src/mage/cards/n/NecromancersMagemark.java @@ -17,7 +17,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.EnchantedPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -37,7 +36,7 @@ public final class NecromancersMagemark extends CardImpl { static { filter.add(EnchantedPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public NecromancersMagemark(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NeedletoothRaptor.java b/Mage.Sets/src/mage/cards/n/NeedletoothRaptor.java index 99e1b850fa5..5b05afb8f16 100644 --- a/Mage.Sets/src/mage/cards/n/NeedletoothRaptor.java +++ b/Mage.Sets/src/mage/cards/n/NeedletoothRaptor.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class NeedletoothRaptor extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public NeedletoothRaptor(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NehebTheWorthy.java b/Mage.Sets/src/mage/cards/n/NehebTheWorthy.java index c5d40b9d3e0..1391844b9f6 100644 --- a/Mage.Sets/src/mage/cards/n/NehebTheWorthy.java +++ b/Mage.Sets/src/mage/cards/n/NehebTheWorthy.java @@ -17,7 +17,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -29,7 +28,7 @@ public final class NehebTheWorthy extends CardImpl { static { filter.add(SubType.MINOTAUR.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public NehebTheWorthy(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NettlingImp.java b/Mage.Sets/src/mage/cards/n/NettlingImp.java index 99647d70b21..04a7ab43f34 100644 --- a/Mage.Sets/src/mage/cards/n/NettlingImp.java +++ b/Mage.Sets/src/mage/cards/n/NettlingImp.java @@ -19,7 +19,6 @@ import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.ControlledFromStartOfControllerTurnPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; @@ -37,7 +36,7 @@ public final class NettlingImp extends CardImpl { static { filter.add(Predicates.not(SubType.WALL.getPredicate())); filter.add(new ControlledFromStartOfControllerTurnPredicate()); - filter.add(new ControllerPredicate(TargetController.ACTIVE)); + filter.add(TargetController.ACTIVE.getControllerPredicate()); filter.setMessage("non-Wall creature the active player has controlled continuously since the beginning of the turn."); } diff --git a/Mage.Sets/src/mage/cards/n/NewPrahvGuildmage.java b/Mage.Sets/src/mage/cards/n/NewPrahvGuildmage.java index 18464f67777..ea09fda2254 100644 --- a/Mage.Sets/src/mage/cards/n/NewPrahvGuildmage.java +++ b/Mage.Sets/src/mage/cards/n/NewPrahvGuildmage.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetNonlandPermanent; @@ -30,7 +29,7 @@ public final class NewPrahvGuildmage extends CardImpl { private static final FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanent an opponent control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public NewPrahvGuildmage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NiblisOfFrost.java b/Mage.Sets/src/mage/cards/n/NiblisOfFrost.java index a0d0d6b82d8..139c3d79b38 100644 --- a/Mage.Sets/src/mage/cards/n/NiblisOfFrost.java +++ b/Mage.Sets/src/mage/cards/n/NiblisOfFrost.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -26,7 +25,7 @@ public final class NiblisOfFrost extends CardImpl { private static final FilterCreaturePermanent filterCreature = new FilterCreaturePermanent("creature an opponent controls"); static { - filterCreature.add(new ControllerPredicate(TargetController.OPPONENT)); + filterCreature.add(TargetController.OPPONENT.getControllerPredicate()); } public NiblisOfFrost(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java b/Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java index 7744338e101..65f0aa53946 100644 --- a/Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java +++ b/Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java @@ -13,7 +13,6 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.players.Library; import mage.players.Player; @@ -35,7 +34,7 @@ public final class NicolBolasGodPharaoh extends CardImpl { private static final FilterPermanent opponentsNonlandPermanentsFilter = new FilterNonlandPermanent("non-land permanents your opponents control"); static { - opponentsNonlandPermanentsFilter.add(new ControllerPredicate(TargetController.OPPONENT)); + opponentsNonlandPermanentsFilter.add(TargetController.OPPONENT.getControllerPredicate()); } public NicolBolasGodPharaoh(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NightmareIncursion.java b/Mage.Sets/src/mage/cards/n/NightmareIncursion.java index b103cd029e7..f90193df988 100644 --- a/Mage.Sets/src/mage/cards/n/NightmareIncursion.java +++ b/Mage.Sets/src/mage/cards/n/NightmareIncursion.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; @@ -51,7 +50,7 @@ class NightmareIncursionEffect extends OneShotEffect { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.SWAMP.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/n/NightmareLash.java b/Mage.Sets/src/mage/cards/n/NightmareLash.java index d997dd523e3..046adfbadd5 100644 --- a/Mage.Sets/src/mage/cards/n/NightmareLash.java +++ b/Mage.Sets/src/mage/cards/n/NightmareLash.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -22,7 +21,7 @@ public final class NightmareLash extends CardImpl { static { filter.add(SubType.SWAMP.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public NightmareLash(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NimbleObstructionist.java b/Mage.Sets/src/mage/cards/n/NimbleObstructionist.java index 90a3f8448aa..f78cedcab65 100644 --- a/Mage.Sets/src/mage/cards/n/NimbleObstructionist.java +++ b/Mage.Sets/src/mage/cards/n/NimbleObstructionist.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterStackObject; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetActivatedOrTriggeredAbility; /** @@ -27,7 +26,7 @@ public final class NimbleObstructionist extends CardImpl { private static final FilterStackObject filter = new FilterStackObject("activated or triggered ability you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public NimbleObstructionist(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NinthBridgePatrol.java b/Mage.Sets/src/mage/cards/n/NinthBridgePatrol.java index 1ba7fd421b9..688514126ce 100644 --- a/Mage.Sets/src/mage/cards/n/NinthBridgePatrol.java +++ b/Mage.Sets/src/mage/cards/n/NinthBridgePatrol.java @@ -14,7 +14,6 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class NinthBridgePatrol extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/n/NissaVitalForce.java b/Mage.Sets/src/mage/cards/n/NissaVitalForce.java index 42555bb7d75..6dc9746db6c 100644 --- a/Mage.Sets/src/mage/cards/n/NissaVitalForce.java +++ b/Mage.Sets/src/mage/cards/n/NissaVitalForce.java @@ -19,7 +19,6 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.command.emblems.NissaVitalForceEmblem; import mage.game.permanent.token.TokenImpl; import mage.target.common.TargetCardInYourGraveyard; @@ -34,7 +33,7 @@ public final class NissaVitalForce extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("land you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public NissaVitalForce(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NissaVoiceOfZendikar.java b/Mage.Sets/src/mage/cards/n/NissaVoiceOfZendikar.java index b1e29389dc3..3bca0a20e30 100644 --- a/Mage.Sets/src/mage/cards/n/NissaVoiceOfZendikar.java +++ b/Mage.Sets/src/mage/cards/n/NissaVoiceOfZendikar.java @@ -19,7 +19,6 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.PlantToken; /** @@ -31,7 +30,7 @@ public final class NissaVoiceOfZendikar extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("lands you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public NissaVoiceOfZendikar(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NissasJudgment.java b/Mage.Sets/src/mage/cards/n/NissasJudgment.java index cdb1103af43..e7042d665b3 100644 --- a/Mage.Sets/src/mage/cards/n/NissasJudgment.java +++ b/Mage.Sets/src/mage/cards/n/NissasJudgment.java @@ -13,7 +13,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -30,7 +29,7 @@ public final class NissasJudgment extends CardImpl { private static final FilterCreaturePermanent FILTER = new FilterCreaturePermanent("creature an opponent controls"); static { - FILTER.add(new ControllerPredicate(TargetController.OPPONENT)); + FILTER.add(TargetController.OPPONENT.getControllerPredicate()); } public NissasJudgment(UUID ownerId, CardSetInfo setInfo) { @@ -63,7 +62,7 @@ class NissasJudgmentEffect extends OneShotEffect { private static final FilterCreaturePermanent filterWithCounter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filterWithCounter.add(new CounterPredicate(CounterType.P1P1)); } diff --git a/Mage.Sets/src/mage/cards/n/NivixGuildmage.java b/Mage.Sets/src/mage/cards/n/NivixGuildmage.java index 94845e98831..74f2cd8b618 100644 --- a/Mage.Sets/src/mage/cards/n/NivixGuildmage.java +++ b/Mage.Sets/src/mage/cards/n/NivixGuildmage.java @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetSpell; /** @@ -31,7 +30,7 @@ public final class NivixGuildmage extends CardImpl { filter.add(Predicates.or( CardType.INSTANT.getPredicate(), CardType.SORCERY.getPredicate())); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public NivixGuildmage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NivmagusElemental.java b/Mage.Sets/src/mage/cards/n/NivmagusElemental.java index a8a01f73269..fa93c41cc0b 100644 --- a/Mage.Sets/src/mage/cards/n/NivmagusElemental.java +++ b/Mage.Sets/src/mage/cards/n/NivmagusElemental.java @@ -16,7 +16,6 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetSpell; /** @@ -28,7 +27,7 @@ public final class NivmagusElemental extends CardImpl { private static final FilterSpell filter = new FilterSpell("an instant or sorcery spell you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.or( CardType.INSTANT.getPredicate(), CardType.SORCERY.getPredicate())); diff --git a/Mage.Sets/src/mage/cards/n/Norritt.java b/Mage.Sets/src/mage/cards/n/Norritt.java index b5da6375347..a6d6cd7fb36 100644 --- a/Mage.Sets/src/mage/cards/n/Norritt.java +++ b/Mage.Sets/src/mage/cards/n/Norritt.java @@ -23,7 +23,6 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.ControlledFromStartOfControllerTurnPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; @@ -46,7 +45,7 @@ public final class Norritt extends CardImpl { static { filterCreature.add(Predicates.not(SubType.WALL.getPredicate())); filterCreature.add(new ControlledFromStartOfControllerTurnPredicate()); - filterCreature.add(new ControllerPredicate(TargetController.ACTIVE)); + filterCreature.add(TargetController.ACTIVE.getControllerPredicate()); filterCreature.setMessage("non-Wall creature the active player has controlled continuously since the beginning of the turn."); } diff --git a/Mage.Sets/src/mage/cards/n/NotOfThisWorld.java b/Mage.Sets/src/mage/cards/n/NotOfThisWorld.java index b3d50c71da4..a253cb7073d 100644 --- a/Mage.Sets/src/mage/cards/n/NotOfThisWorld.java +++ b/Mage.Sets/src/mage/cards/n/NotOfThisWorld.java @@ -13,7 +13,6 @@ import mage.constants.*; import mage.filter.Filter; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.stack.Spell; import mage.game.stack.StackAbility; @@ -146,7 +145,7 @@ enum NotOfThisWorldCondition implements Condition { static { filter.add(new PowerPredicate(ComparisonType.MORE_THAN, 6)); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/o/OathOfChandra.java b/Mage.Sets/src/mage/cards/o/OathOfChandra.java index 6dfec92ff91..bac9642dd50 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfChandra.java +++ b/Mage.Sets/src/mage/cards/o/OathOfChandra.java @@ -17,7 +17,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -33,7 +32,7 @@ public final class OathOfChandra extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public OathOfChandra(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OathOfTheAncientWood.java b/Mage.Sets/src/mage/cards/o/OathOfTheAncientWood.java index bba3d84e698..a2f1acfa262 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfTheAncientWood.java +++ b/Mage.Sets/src/mage/cards/o/OathOfTheAncientWood.java @@ -14,7 +14,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterEnchantmentPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -26,7 +25,7 @@ public final class OathOfTheAncientWood extends CardImpl { private static final FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent("Oath of the Ancient Wood or another enchantment"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public OathOfTheAncientWood(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OgreBattledriver.java b/Mage.Sets/src/mage/cards/o/OgreBattledriver.java index accee718865..4373685c630 100644 --- a/Mage.Sets/src/mage/cards/o/OgreBattledriver.java +++ b/Mage.Sets/src/mage/cards/o/OgreBattledriver.java @@ -18,7 +18,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -29,7 +28,7 @@ public final class OgreBattledriver extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/o/OgreGeargrabber.java b/Mage.Sets/src/mage/cards/o/OgreGeargrabber.java index cbfd159c768..5cdd45d7c33 100644 --- a/Mage.Sets/src/mage/cards/o/OgreGeargrabber.java +++ b/Mage.Sets/src/mage/cards/o/OgreGeargrabber.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -30,7 +29,7 @@ public final class OgreGeargrabber extends CardImpl { static { filter.add(CardType.ARTIFACT.getPredicate()); filter.add(SubType.EQUIPMENT.getPredicate()); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public OgreGeargrabber(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OjutaiSoulOfWinter.java b/Mage.Sets/src/mage/cards/o/OjutaiSoulOfWinter.java index 411894d536c..6a6cf530cce 100644 --- a/Mage.Sets/src/mage/cards/o/OjutaiSoulOfWinter.java +++ b/Mage.Sets/src/mage/cards/o/OjutaiSoulOfWinter.java @@ -15,7 +15,6 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; /** @@ -29,8 +28,8 @@ public final class OjutaiSoulOfWinter extends CardImpl { static { filterDragon.add(SubType.DRAGON.getPredicate()); - filterDragon.add(new ControllerPredicate(TargetController.YOU)); - filterNonlandPermanent.add(new ControllerPredicate(TargetController.OPPONENT)); + filterDragon.add(TargetController.YOU.getControllerPredicate()); + filterNonlandPermanent.add(TargetController.OPPONENT.getControllerPredicate()); } public OjutaiSoulOfWinter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OliviaVoldaren.java b/Mage.Sets/src/mage/cards/o/OliviaVoldaren.java index 6e835476ea2..0c9b7699604 100644 --- a/Mage.Sets/src/mage/cards/o/OliviaVoldaren.java +++ b/Mage.Sets/src/mage/cards/o/OliviaVoldaren.java @@ -22,7 +22,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardIdPredicate; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -50,7 +49,7 @@ public final class OliviaVoldaren extends CardImpl { String rule = "Gain control of target Vampire for as long as you control {this}"; FilterPermanent filter2 = new FilterPermanent(); - filter2.add(new ControllerPredicate(TargetController.YOU)); + filter2.add(TargetController.YOU.getControllerPredicate()); filter2.add(new CardIdPredicate(this.getId())); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/cards/o/OminousSphinx.java b/Mage.Sets/src/mage/cards/o/OminousSphinx.java index 7a7cf5d0148..19a6e04385e 100644 --- a/Mage.Sets/src/mage/cards/o/OminousSphinx.java +++ b/Mage.Sets/src/mage/cards/o/OminousSphinx.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -25,7 +24,7 @@ public final class OminousSphinx extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public OminousSphinx(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java b/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java index d0cefaf7bef..1b8c566a57c 100644 --- a/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java +++ b/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.OmnathElementalToken; import mage.target.common.TargetAnyTarget; @@ -29,7 +28,7 @@ public final class OmnathLocusOfRage extends CardImpl { static { filter.add(SubType.ELEMENTAL.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public OmnathLocusOfRage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OnduCleric.java b/Mage.Sets/src/mage/cards/o/OnduCleric.java index 5774cd67631..f05a0ab0790 100644 --- a/Mage.Sets/src/mage/cards/o/OnduCleric.java +++ b/Mage.Sets/src/mage/cards/o/OnduCleric.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -24,7 +23,7 @@ public final class OnduCleric extends CardImpl { static { filter.add(SubType.ALLY.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public OnduCleric(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OneEyedScarecrow.java b/Mage.Sets/src/mage/cards/o/OneEyedScarecrow.java index b6db1f40706..4b57ead38e4 100644 --- a/Mage.Sets/src/mage/cards/o/OneEyedScarecrow.java +++ b/Mage.Sets/src/mage/cards/o/OneEyedScarecrow.java @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -28,7 +27,7 @@ public final class OneEyedScarecrow extends CardImpl { static { filter.add(new AbilityPredicate(FlyingAbility.class)); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public OneEyedScarecrow(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OpenTheGraves.java b/Mage.Sets/src/mage/cards/o/OpenTheGraves.java index aeb45f4a0eb..f3a4e3d6ffa 100644 --- a/Mage.Sets/src/mage/cards/o/OpenTheGraves.java +++ b/Mage.Sets/src/mage/cards/o/OpenTheGraves.java @@ -9,7 +9,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.ZombieToken; @@ -22,7 +21,7 @@ public final class OpenTheGraves extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.not(TokenPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/o/OpportunisticDragon.java b/Mage.Sets/src/mage/cards/o/OpportunisticDragon.java index dc5fe274359..aead5e13281 100644 --- a/Mage.Sets/src/mage/cards/o/OpportunisticDragon.java +++ b/Mage.Sets/src/mage/cards/o/OpportunisticDragon.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -33,7 +32,7 @@ public final class OpportunisticDragon extends CardImpl { CardType.ARTIFACT.getPredicate(), SubType.HUMAN.getPredicate() )); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public OpportunisticDragon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OrcSureshot.java b/Mage.Sets/src/mage/cards/o/OrcSureshot.java index f499838e56c..8808c3fee28 100644 --- a/Mage.Sets/src/mage/cards/o/OrcSureshot.java +++ b/Mage.Sets/src/mage/cards/o/OrcSureshot.java @@ -16,7 +16,6 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -30,7 +29,7 @@ public final class OrcSureshot extends CardImpl { static { filter.add(AnotherPredicate.instance); - filterOpponentCreature.add(new ControllerPredicate(TargetController.OPPONENT)); + filterOpponentCreature.add(TargetController.OPPONENT.getControllerPredicate()); } public OrcSureshot(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/Order66.java b/Mage.Sets/src/mage/cards/o/Order66.java index 44853ccd59a..991ac95f64c 100644 --- a/Mage.Sets/src/mage/cards/o/Order66.java +++ b/Mage.Sets/src/mage/cards/o/Order66.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -21,7 +20,7 @@ public final class Order66 extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public Order66(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OreskosExplorer.java b/Mage.Sets/src/mage/cards/o/OreskosExplorer.java index 169e7a78793..6739d16e87b 100644 --- a/Mage.Sets/src/mage/cards/o/OreskosExplorer.java +++ b/Mage.Sets/src/mage/cards/o/OreskosExplorer.java @@ -14,7 +14,6 @@ import mage.cards.CardsImpl; import mage.constants.*; import mage.filter.common.FilterLandCard; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; @@ -83,7 +82,7 @@ class OreskosExplorerEffect extends OneShotEffect { } if (landsToSearch > 0) { FilterLandCard filterPlains = new FilterLandCard("up to " + landsToSearch + " Plains cards"); - filterPlains.add(new ControllerPredicate(TargetController.YOU)); + filterPlains.add(TargetController.YOU.getControllerPredicate()); filterPlains.add(SubType.PLAINS.getPredicate()); TargetCardInLibrary target = new TargetCardInLibrary(0, landsToSearch, filterPlains); if (controller.searchLibrary(target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/o/OrzhovPontiff.java b/Mage.Sets/src/mage/cards/o/OrzhovPontiff.java index 34017c4171e..60b4f4675b4 100644 --- a/Mage.Sets/src/mage/cards/o/OrzhovPontiff.java +++ b/Mage.Sets/src/mage/cards/o/OrzhovPontiff.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,8 +24,8 @@ public final class OrzhovPontiff extends CardImpl { private static final FilterCreaturePermanent filterControlled = new FilterCreaturePermanent("Creatures you control"); private static final FilterCreaturePermanent filterNotControlled = new FilterCreaturePermanent("creatures you don't control"); static { - filterControlled.add(new ControllerPredicate(TargetController.YOU)); - filterNotControlled.add((new ControllerPredicate(TargetController.NOT_YOU))); + filterControlled.add(TargetController.YOU.getControllerPredicate()); + filterNotControlled.add((TargetController.NOT_YOU.getControllerPredicate())); } public OrzhovPontiff(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/Outmuscle.java b/Mage.Sets/src/mage/cards/o/Outmuscle.java index 02fc9bbbbfa..7d73f6677bc 100644 --- a/Mage.Sets/src/mage/cards/o/Outmuscle.java +++ b/Mage.Sets/src/mage/cards/o/Outmuscle.java @@ -14,7 +14,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -33,7 +32,7 @@ public final class Outmuscle extends CardImpl { = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public Outmuscle(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OvalchaseDaredevil.java b/Mage.Sets/src/mage/cards/o/OvalchaseDaredevil.java index 8505e969e1b..1218324f8ab 100644 --- a/Mage.Sets/src/mage/cards/o/OvalchaseDaredevil.java +++ b/Mage.Sets/src/mage/cards/o/OvalchaseDaredevil.java @@ -14,7 +14,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class OvalchaseDaredevil extends CardImpl { private static final FilterPermanent filter = new FilterArtifactPermanent("an artifact"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public OvalchaseDaredevil(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OverseerOfTheDamned.java b/Mage.Sets/src/mage/cards/o/OverseerOfTheDamned.java index a828ea6ca83..0b43d0b4835 100644 --- a/Mage.Sets/src/mage/cards/o/OverseerOfTheDamned.java +++ b/Mage.Sets/src/mage/cards/o/OverseerOfTheDamned.java @@ -16,9 +16,7 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; -import mage.game.permanent.token.TokenImpl; import mage.game.permanent.token.Token; import mage.game.permanent.token.ZombieToken; import mage.target.common.TargetCreaturePermanent; @@ -32,7 +30,7 @@ public final class OverseerOfTheDamned extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filter.add(Predicates.not(TokenPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/p/PalaceJailer.java b/Mage.Sets/src/mage/cards/p/PalaceJailer.java index 4ecbe074132..bdf2f6c4fa5 100644 --- a/Mage.Sets/src/mage/cards/p/PalaceJailer.java +++ b/Mage.Sets/src/mage/cards/p/PalaceJailer.java @@ -21,7 +21,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.ExileZone; import mage.game.Game; import mage.game.events.GameEvent; @@ -38,7 +37,7 @@ public final class PalaceJailer extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public PalaceJailer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PalliationAccord.java b/Mage.Sets/src/mage/cards/p/PalliationAccord.java index 78b2be72872..7b697391a8e 100644 --- a/Mage.Sets/src/mage/cards/p/PalliationAccord.java +++ b/Mage.Sets/src/mage/cards/p/PalliationAccord.java @@ -15,7 +15,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -26,7 +25,7 @@ public final class PalliationAccord extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public PalliationAccord(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PallidMycoderm.java b/Mage.Sets/src/mage/cards/p/PallidMycoderm.java index 9fd681bc8a8..9a7adb49bdd 100644 --- a/Mage.Sets/src/mage/cards/p/PallidMycoderm.java +++ b/Mage.Sets/src/mage/cards/p/PallidMycoderm.java @@ -17,7 +17,6 @@ import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.SaprolingToken; import mage.target.common.TargetControlledCreaturePermanent; @@ -30,7 +29,7 @@ public final class PallidMycoderm extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Each creature you control that's a Fungus or a Saproling"); private static final FilterControlledCreaturePermanent filterSaproling = new FilterControlledCreaturePermanent("a Saproling"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.or(SubType.FUNGUS.getPredicate(), SubType.SAPROLING.getPredicate())); filterSaproling.add(SubType.SAPROLING.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java b/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java index c470aa6daec..c1e24538726 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java @@ -23,7 +23,6 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -37,7 +36,7 @@ public final class ParagonOfEternalWilds extends CardImpl { static { filterGreen.add(new ColorPredicate(ObjectColor.GREEN)); - filterGreen.add(new ControllerPredicate(TargetController.YOU)); + filterGreen.add(TargetController.YOU.getControllerPredicate()); filterGreen2.add(new ColorPredicate(ObjectColor.GREEN)); filterGreen2.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java b/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java index c25d4921ded..e7f84eee886 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java @@ -23,7 +23,6 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -37,7 +36,7 @@ public final class ParagonOfGatheringMists extends CardImpl { static { filterBlue.add(new ColorPredicate(ObjectColor.BLUE)); - filterBlue.add(new ControllerPredicate(TargetController.YOU)); + filterBlue.add(TargetController.YOU.getControllerPredicate()); filterBlue2.add(new ColorPredicate(ObjectColor.BLUE)); filterBlue2.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java b/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java index a186d548cb0..8000b32abf3 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java @@ -22,7 +22,6 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -36,10 +35,10 @@ public final class ParagonOfNewDawns extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.WHITE)); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter2.add(AnotherPredicate.instance); filter2.add(new ColorPredicate(ObjectColor.WHITE)); - filter2.add(new ControllerPredicate(TargetController.YOU)); + filter2.add(TargetController.YOU.getControllerPredicate()); } public ParagonOfNewDawns(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PashalikMons.java b/Mage.Sets/src/mage/cards/p/PashalikMons.java index 015c0805a78..21e75916877 100644 --- a/Mage.Sets/src/mage/cards/p/PashalikMons.java +++ b/Mage.Sets/src/mage/cards/p/PashalikMons.java @@ -18,7 +18,6 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.GoblinToken; import mage.target.common.TargetAnyTarget; import mage.target.common.TargetControlledPermanent; @@ -37,7 +36,7 @@ public final class PashalikMons extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public PashalikMons(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PathOfBravery.java b/Mage.Sets/src/mage/cards/p/PathOfBravery.java index 456ac2cac4b..e0b4e8768b1 100644 --- a/Mage.Sets/src/mage/cards/p/PathOfBravery.java +++ b/Mage.Sets/src/mage/cards/p/PathOfBravery.java @@ -17,7 +17,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.players.Player; @@ -29,7 +28,7 @@ public final class PathOfBravery extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } static final String rule = "As long as your life total is greater than or equal to your starting life total, creatures you control get +1/+1"; diff --git a/Mage.Sets/src/mage/cards/p/PatronOfTheVein.java b/Mage.Sets/src/mage/cards/p/PatronOfTheVein.java index 768afc53a4b..c9617563d22 100644 --- a/Mage.Sets/src/mage/cards/p/PatronOfTheVein.java +++ b/Mage.Sets/src/mage/cards/p/PatronOfTheVein.java @@ -23,7 +23,6 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent.EventType; import mage.game.events.GameEvent; @@ -42,7 +41,7 @@ public final class PatronOfTheVein extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public PatronOfTheVein(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PeelFromReality.java b/Mage.Sets/src/mage/cards/p/PeelFromReality.java index 00e9316ac2f..b38f818961d 100644 --- a/Mage.Sets/src/mage/cards/p/PeelFromReality.java +++ b/Mage.Sets/src/mage/cards/p/PeelFromReality.java @@ -11,7 +11,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -26,7 +25,7 @@ public final class PeelFromReality extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public PeelFromReality(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PendelhavenElder.java b/Mage.Sets/src/mage/cards/p/PendelhavenElder.java index f1e794e2354..63f598271b1 100644 --- a/Mage.Sets/src/mage/cards/p/PendelhavenElder.java +++ b/Mage.Sets/src/mage/cards/p/PendelhavenElder.java @@ -17,7 +17,6 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; import mage.filter.predicate.mageobject.ToughnessPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -30,7 +29,7 @@ public final class PendelhavenElder extends CardImpl { static { filter.add(new PowerPredicate(ComparisonType.EQUAL_TO, 1)); filter.add(new ToughnessPredicate(ComparisonType.EQUAL_TO, 1)); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public PendelhavenElder(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PerilousVoyage.java b/Mage.Sets/src/mage/cards/p/PerilousVoyage.java index 92d08052009..2fb89445b77 100644 --- a/Mage.Sets/src/mage/cards/p/PerilousVoyage.java +++ b/Mage.Sets/src/mage/cards/p/PerilousVoyage.java @@ -11,7 +11,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -26,7 +25,7 @@ public final class PerilousVoyage extends CardImpl { private static final FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanent you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public PerilousVoyage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PhantomGeneral.java b/Mage.Sets/src/mage/cards/p/PhantomGeneral.java index 4f2ac31139f..10678e471fc 100644 --- a/Mage.Sets/src/mage/cards/p/PhantomGeneral.java +++ b/Mage.Sets/src/mage/cards/p/PhantomGeneral.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; /** @@ -25,7 +24,7 @@ public final class PhantomGeneral extends CardImpl { static { filter.add(TokenPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public PhantomGeneral(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PheresBandWarchief.java b/Mage.Sets/src/mage/cards/p/PheresBandWarchief.java index 045b5920eab..81994e613eb 100644 --- a/Mage.Sets/src/mage/cards/p/PheresBandWarchief.java +++ b/Mage.Sets/src/mage/cards/p/PheresBandWarchief.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -26,7 +25,7 @@ public final class PheresBandWarchief extends CardImpl { static { filter.add(SubType.CENTAUR.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public PheresBandWarchief(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PiratesCutlass.java b/Mage.Sets/src/mage/cards/p/PiratesCutlass.java index 01500f9019e..4dde899c5a7 100644 --- a/Mage.Sets/src/mage/cards/p/PiratesCutlass.java +++ b/Mage.Sets/src/mage/cards/p/PiratesCutlass.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -30,7 +29,7 @@ public final class PiratesCutlass extends CardImpl { static { filter.add(SubType.PIRATE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public PiratesCutlass(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PitilessPlunderer.java b/Mage.Sets/src/mage/cards/p/PitilessPlunderer.java index 38d5ac492ad..da0f380a03e 100644 --- a/Mage.Sets/src/mage/cards/p/PitilessPlunderer.java +++ b/Mage.Sets/src/mage/cards/p/PitilessPlunderer.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.TreasureToken; /** @@ -25,7 +24,7 @@ public final class PitilessPlunderer extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public PitilessPlunderer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PlagueBelcher.java b/Mage.Sets/src/mage/cards/p/PlagueBelcher.java index edd51cfe318..941625e15dc 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueBelcher.java +++ b/Mage.Sets/src/mage/cards/p/PlagueBelcher.java @@ -17,7 +17,6 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -29,7 +28,7 @@ public final class PlagueBelcher extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another Zombie you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.ZOMBIE.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/p/PlagueWind.java b/Mage.Sets/src/mage/cards/p/PlagueWind.java index 868dd6b13a4..9e227106736 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueWind.java +++ b/Mage.Sets/src/mage/cards/p/PlagueWind.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -18,7 +17,7 @@ public final class PlagueWind extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you don't control"); static{ - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public PlagueWind(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PlanarOverlay.java b/Mage.Sets/src/mage/cards/p/PlanarOverlay.java index 8a0245f1200..7c34965324d 100644 --- a/Mage.Sets/src/mage/cards/p/PlanarOverlay.java +++ b/Mage.Sets/src/mage/cards/p/PlanarOverlay.java @@ -7,7 +7,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.players.Player; import mage.target.Target; @@ -66,7 +65,7 @@ class PlanarOverlayEffect extends OneShotEffect { for (SubType landName : SubType.getBasicLands()) { FilterLandPermanent filter = new FilterLandPermanent(landName + " to return to hand"); filter.add(landName.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); Target target = new TargetLandPermanent(1, 1, filter, true); if (target.canChoose(source.getSourceId(), player.getId(), game)) { player.chooseTarget(outcome, target, source, game); diff --git a/Mage.Sets/src/mage/cards/p/PoeDameron.java b/Mage.Sets/src/mage/cards/p/PoeDameron.java index 9637e1753cc..c653c13fbd9 100644 --- a/Mage.Sets/src/mage/cards/p/PoeDameron.java +++ b/Mage.Sets/src/mage/cards/p/PoeDameron.java @@ -9,7 +9,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; /** @@ -22,9 +21,9 @@ public final class PoeDameron extends CardImpl { private static final FilterCreaturePermanent filterStarship = new FilterCreaturePermanent("starship creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.not(TokenPredicate.instance)); - filterStarship.add(new ControllerPredicate(TargetController.YOU)); + filterStarship.add(TargetController.YOU.getControllerPredicate()); filterStarship.add(SubType.STARSHIP.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/p/PoliticalTrickery.java b/Mage.Sets/src/mage/cards/p/PoliticalTrickery.java index 7ad0a7370f3..b73084a44e8 100644 --- a/Mage.Sets/src/mage/cards/p/PoliticalTrickery.java +++ b/Mage.Sets/src/mage/cards/p/PoliticalTrickery.java @@ -11,7 +11,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; @@ -26,7 +25,7 @@ public final class PoliticalTrickery extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("land an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public PoliticalTrickery(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PollutedBonds.java b/Mage.Sets/src/mage/cards/p/PollutedBonds.java index 1ceb68a6e13..28f4f45779b 100644 --- a/Mage.Sets/src/mage/cards/p/PollutedBonds.java +++ b/Mage.Sets/src/mage/cards/p/PollutedBonds.java @@ -4,7 +4,6 @@ package mage.cards.p; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; -import mage.abilities.effects.Effect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; @@ -14,7 +13,6 @@ import mage.constants.SetTargetPointer; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -26,7 +24,7 @@ public final class PollutedBonds extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("a land"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public PollutedBonds(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PolymorphousRush.java b/Mage.Sets/src/mage/cards/p/PolymorphousRush.java index fde45d36817..7906f471806 100644 --- a/Mage.Sets/src/mage/cards/p/PolymorphousRush.java +++ b/Mage.Sets/src/mage/cards/p/PolymorphousRush.java @@ -10,10 +10,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/p/PontiffOfBlight.java b/Mage.Sets/src/mage/cards/p/PontiffOfBlight.java index d7f18675a4a..d823b2a277e 100644 --- a/Mage.Sets/src/mage/cards/p/PontiffOfBlight.java +++ b/Mage.Sets/src/mage/cards/p/PontiffOfBlight.java @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -29,7 +28,7 @@ public final class PontiffOfBlight extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Other creatures you control"); static { filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public PontiffOfBlight (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/Pounce.java b/Mage.Sets/src/mage/cards/p/Pounce.java index a828265f146..8ec34d321e9 100644 --- a/Mage.Sets/src/mage/cards/p/Pounce.java +++ b/Mage.Sets/src/mage/cards/p/Pounce.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -22,7 +21,7 @@ public final class Pounce extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public Pounce(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PredatoryRampage.java b/Mage.Sets/src/mage/cards/p/PredatoryRampage.java index ec0f8ad1291..d8c8ea0e675 100644 --- a/Mage.Sets/src/mage/cards/p/PredatoryRampage.java +++ b/Mage.Sets/src/mage/cards/p/PredatoryRampage.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @author magenoxx_at_gmail.com @@ -22,7 +21,7 @@ public final class PredatoryRampage extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Each creature your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public PredatoryRampage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PrepareFight.java b/Mage.Sets/src/mage/cards/p/PrepareFight.java index 366411f7ab5..fa7ddd4902e 100644 --- a/Mage.Sets/src/mage/cards/p/PrepareFight.java +++ b/Mage.Sets/src/mage/cards/p/PrepareFight.java @@ -8,12 +8,10 @@ import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.AftermathAbility; import mage.abilities.keyword.LifelinkAbility; -import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.SplitCard; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -27,7 +25,7 @@ public final class PrepareFight extends SplitCard { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public PrepareFight(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PreyUpon.java b/Mage.Sets/src/mage/cards/p/PreyUpon.java index 816b9cf89ce..85bf7926cfa 100644 --- a/Mage.Sets/src/mage/cards/p/PreyUpon.java +++ b/Mage.Sets/src/mage/cards/p/PreyUpon.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -22,7 +21,7 @@ public final class PreyUpon extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public PreyUpon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PrimalBellow.java b/Mage.Sets/src/mage/cards/p/PrimalBellow.java index e285157b64a..4de28f94b75 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalBellow.java +++ b/Mage.Sets/src/mage/cards/p/PrimalBellow.java @@ -11,7 +11,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class PrimalBellow extends CardImpl { static { filter.add(SubType.FOREST.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/p/PrimalForcemage.java b/Mage.Sets/src/mage/cards/p/PrimalForcemage.java index 954fd329c83..c237ec77b95 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalForcemage.java +++ b/Mage.Sets/src/mage/cards/p/PrimalForcemage.java @@ -15,7 +15,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -26,7 +25,7 @@ public final class PrimalForcemage extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/p/PrimevalProtector.java b/Mage.Sets/src/mage/cards/p/PrimevalProtector.java index 7a09b0723b9..68162877e3c 100644 --- a/Mage.Sets/src/mage/cards/p/PrimevalProtector.java +++ b/Mage.Sets/src/mage/cards/p/PrimevalProtector.java @@ -22,7 +22,6 @@ import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.players.Player; import mage.util.CardUtil; @@ -70,7 +69,7 @@ class PrimevalProtectorCostReductionEffect extends CostModificationEffectImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("each creature your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } PrimevalProtectorCostReductionEffect() { diff --git a/Mage.Sets/src/mage/cards/p/PrisonRealm.java b/Mage.Sets/src/mage/cards/p/PrisonRealm.java index e22f4296d9a..f4ba5c514a7 100644 --- a/Mage.Sets/src/mage/cards/p/PrisonRealm.java +++ b/Mage.Sets/src/mage/cards/p/PrisonRealm.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import java.util.UUID; @@ -26,7 +25,7 @@ public final class PrisonRealm extends CardImpl { = new FilterCreatureOrPlaneswalkerPermanent("creature or planeswalker an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public PrisonRealm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PrisonTerm.java b/Mage.Sets/src/mage/cards/p/PrisonTerm.java index 9cda6350d15..dd79bea92cb 100644 --- a/Mage.Sets/src/mage/cards/p/PrisonTerm.java +++ b/Mage.Sets/src/mage/cards/p/PrisonTerm.java @@ -19,7 +19,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -35,7 +34,7 @@ public final class PrisonTerm extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("a creature"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public PrisonTerm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/ProfanerOfTheDead.java b/Mage.Sets/src/mage/cards/p/ProfanerOfTheDead.java index 4ed17ac858d..f7336f9897b 100644 --- a/Mage.Sets/src/mage/cards/p/ProfanerOfTheDead.java +++ b/Mage.Sets/src/mage/cards/p/ProfanerOfTheDead.java @@ -14,7 +14,6 @@ import mage.cards.CardsImpl; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ToughnessPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -66,7 +65,7 @@ class ProfanerOfTheDeadReturnEffect extends OneShotEffect { Permanent exploitedCreature = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, source)); if (controller != null && exploitedCreature != null) { FilterCreaturePermanent filter = new FilterCreaturePermanent(); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filter.add(new ToughnessPredicate(ComparisonType.FEWER_THAN, exploitedCreature.getToughness().getValue())); Cards cardsToHand = new CardsImpl(); for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { diff --git a/Mage.Sets/src/mage/cards/p/ProfitLoss.java b/Mage.Sets/src/mage/cards/p/ProfitLoss.java index e1ba2917936..2bf0e5a0249 100644 --- a/Mage.Sets/src/mage/cards/p/ProfitLoss.java +++ b/Mage.Sets/src/mage/cards/p/ProfitLoss.java @@ -11,14 +11,13 @@ import mage.constants.Duration; import mage.constants.SpellAbilityType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; public final class ProfitLoss extends SplitCard { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ProfitLoss(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PromiseOfBunrei.java b/Mage.Sets/src/mage/cards/p/PromiseOfBunrei.java index 6e31d4a2d32..405a8b896e9 100644 --- a/Mage.Sets/src/mage/cards/p/PromiseOfBunrei.java +++ b/Mage.Sets/src/mage/cards/p/PromiseOfBunrei.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.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.SpiritToken; @@ -27,7 +26,7 @@ public final class PromiseOfBunrei extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public PromiseOfBunrei(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/Provoke.java b/Mage.Sets/src/mage/cards/p/Provoke.java index 6ee20aa6deb..37a648c1425 100644 --- a/Mage.Sets/src/mage/cards/p/Provoke.java +++ b/Mage.Sets/src/mage/cards/p/Provoke.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class Provoke extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public Provoke(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PublicExecution.java b/Mage.Sets/src/mage/cards/p/PublicExecution.java index c5f8e25780c..a62ecd834c5 100644 --- a/Mage.Sets/src/mage/cards/p/PublicExecution.java +++ b/Mage.Sets/src/mage/cards/p/PublicExecution.java @@ -11,7 +11,6 @@ import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.ControllerIdPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.PermanentIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -27,7 +26,7 @@ public final class PublicExecution extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public PublicExecution(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PucasMischief.java b/Mage.Sets/src/mage/cards/p/PucasMischief.java index 87de7aab078..536a452b4ce 100644 --- a/Mage.Sets/src/mage/cards/p/PucasMischief.java +++ b/Mage.Sets/src/mage/cards/p/PucasMischief.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -90,7 +89,7 @@ class PucasMischiefSecondTarget extends TargetPermanent { public PucasMischiefSecondTarget() { super(); this.filter = this.filter.copy(); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filter.add(Predicates.not(CardType.LAND.getPredicate())); setTargetName("permanent an opponent controls with an equal or lesser converted mana cost"); } diff --git a/Mage.Sets/src/mage/cards/p/PygmyKavu.java b/Mage.Sets/src/mage/cards/p/PygmyKavu.java index 029b0344459..438d1b66c62 100644 --- a/Mage.Sets/src/mage/cards/p/PygmyKavu.java +++ b/Mage.Sets/src/mage/cards/p/PygmyKavu.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -26,7 +25,7 @@ public final class PygmyKavu extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.BLACK)); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public PygmyKavu(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PyreheartWolf.java b/Mage.Sets/src/mage/cards/p/PyreheartWolf.java index 4bf8f6a4463..f6c51979643 100644 --- a/Mage.Sets/src/mage/cards/p/PyreheartWolf.java +++ b/Mage.Sets/src/mage/cards/p/PyreheartWolf.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class PyreheartWolf extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public PyreheartWolf(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/q/QuagSickness.java b/Mage.Sets/src/mage/cards/q/QuagSickness.java index 880682d77ec..2a272630536 100644 --- a/Mage.Sets/src/mage/cards/q/QuagSickness.java +++ b/Mage.Sets/src/mage/cards/q/QuagSickness.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -26,7 +25,7 @@ public final class QuagSickness extends CardImpl { static { filter.add(SubType.SWAMP.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public QuagSickness(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/q/QuarantineField.java b/Mage.Sets/src/mage/cards/q/QuarantineField.java index 591e3c8d549..978f2b2e050 100644 --- a/Mage.Sets/src/mage/cards/q/QuarantineField.java +++ b/Mage.Sets/src/mage/cards/q/QuarantineField.java @@ -16,7 +16,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -62,7 +61,7 @@ enum QuarantineFieldAdjuster implements TargetAdjuster { if (sourceObject != null) { int isolationCounters = sourceObject.getCounters(game).getCount(CounterType.ISOLATION); FilterNonlandPermanent filter = new FilterNonlandPermanent("up to " + isolationCounters + " nonland permanents controlled by an opponent"); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); ability.addTarget(new TargetPermanent(0, isolationCounters, filter, false)); } } diff --git a/Mage.Sets/src/mage/cards/q/QuestForTheGoblinLord.java b/Mage.Sets/src/mage/cards/q/QuestForTheGoblinLord.java index 3d6137b00ee..35188273f8d 100644 --- a/Mage.Sets/src/mage/cards/q/QuestForTheGoblinLord.java +++ b/Mage.Sets/src/mage/cards/q/QuestForTheGoblinLord.java @@ -14,7 +14,6 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -27,7 +26,7 @@ public final class QuestForTheGoblinLord extends CardImpl { private static final FilterPermanent goblinFilter = new FilterControlledCreaturePermanent("a Goblin"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); goblinFilter.add(SubType.GOBLIN.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/q/QuicksilverFountain.java b/Mage.Sets/src/mage/cards/q/QuicksilverFountain.java index b188158a85b..1a9146fb525 100644 --- a/Mage.Sets/src/mage/cards/q/QuicksilverFountain.java +++ b/Mage.Sets/src/mage/cards/q/QuicksilverFountain.java @@ -22,7 +22,6 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -70,7 +69,7 @@ enum QuicksilverFountainAdjuster implements TargetAdjuster { ability.getTargets().clear(); FilterLandPermanent filter = new FilterLandPermanent(); filter.add(Predicates.not(SubType.ISLAND.getPredicate())); - filter.add(new ControllerPredicate(TargetController.ACTIVE)); + filter.add(TargetController.ACTIVE.getControllerPredicate()); TargetLandPermanent target = new TargetLandPermanent(1, 1, filter, false); target.setTargetController(activePlayer.getId()); ability.getTargets().add(target); diff --git a/Mage.Sets/src/mage/cards/q/QuietContemplation.java b/Mage.Sets/src/mage/cards/q/QuietContemplation.java index f777c0d658c..6f47ca2a7e7 100644 --- a/Mage.Sets/src/mage/cards/q/QuietContemplation.java +++ b/Mage.Sets/src/mage/cards/q/QuietContemplation.java @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -30,7 +29,7 @@ public final class QuietContemplation extends CardImpl { static { filterNonCreature.add(Predicates.not(CardType.CREATURE.getPredicate())); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public QuietContemplation(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RabidBite.java b/Mage.Sets/src/mage/cards/r/RabidBite.java index 547befa27dd..a954933519c 100644 --- a/Mage.Sets/src/mage/cards/r/RabidBite.java +++ b/Mage.Sets/src/mage/cards/r/RabidBite.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -21,7 +20,7 @@ public final class RabidBite extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public RabidBite(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RadiantDestiny.java b/Mage.Sets/src/mage/cards/r/RadiantDestiny.java index b0b9bee0316..a081004834d 100644 --- a/Mage.Sets/src/mage/cards/r/RadiantDestiny.java +++ b/Mage.Sets/src/mage/cards/r/RadiantDestiny.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.permanent.ControllerPredicate; import java.util.UUID; @@ -30,7 +29,7 @@ public final class RadiantDestiny extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control of the chosen type"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public RadiantDestiny(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RageForger.java b/Mage.Sets/src/mage/cards/r/RageForger.java index c15dd3e0af4..3af9a97727d 100644 --- a/Mage.Sets/src/mage/cards/r/RageForger.java +++ b/Mage.Sets/src/mage/cards/r/RageForger.java @@ -18,7 +18,6 @@ import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -36,7 +35,7 @@ public final class RageForger extends CardImpl { static { filter.add(SubType.SHAMAN.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); filterAttack.add(new CounterPredicate(CounterType.P1P1)); } diff --git a/Mage.Sets/src/mage/cards/r/RagebloodShaman.java b/Mage.Sets/src/mage/cards/r/RagebloodShaman.java index ae12ac75d16..c6cb095c0b9 100644 --- a/Mage.Sets/src/mage/cards/r/RagebloodShaman.java +++ b/Mage.Sets/src/mage/cards/r/RagebloodShaman.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -22,7 +21,7 @@ public final class RagebloodShaman extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(SubType.MINOTAUR, "Minotaur creatures"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public RagebloodShaman(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RakshaGoldenCub.java b/Mage.Sets/src/mage/cards/r/RakshaGoldenCub.java index 21a689fdf09..978b18205ff 100644 --- a/Mage.Sets/src/mage/cards/r/RakshaGoldenCub.java +++ b/Mage.Sets/src/mage/cards/r/RakshaGoldenCub.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.permanent.ControllerPredicate; /** * @@ -26,7 +25,7 @@ public final class RakshaGoldenCub extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Cat creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.CAT.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/r/RallyOfWings.java b/Mage.Sets/src/mage/cards/r/RallyOfWings.java index f63a6ca6b4b..b2a5b548a0c 100644 --- a/Mage.Sets/src/mage/cards/r/RallyOfWings.java +++ b/Mage.Sets/src/mage/cards/r/RallyOfWings.java @@ -11,7 +11,6 @@ import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -25,7 +24,7 @@ public final class RallyOfWings extends CardImpl { static { filter.add(new AbilityPredicate(FlyingAbility.class)); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public RallyOfWings(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RalsStaticaster.java b/Mage.Sets/src/mage/cards/r/RalsStaticaster.java index 238140c181e..dcc388b7839 100644 --- a/Mage.Sets/src/mage/cards/r/RalsStaticaster.java +++ b/Mage.Sets/src/mage/cards/r/RalsStaticaster.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -27,7 +26,7 @@ public final class RalsStaticaster extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("a Ral planeswalker"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(CardType.PLANESWALKER.getPredicate()); filter.add(SubType.RAL.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/r/RavagerWurm.java b/Mage.Sets/src/mage/cards/r/RavagerWurm.java index f8af6558fc4..962702de236 100644 --- a/Mage.Sets/src/mage/cards/r/RavagerWurm.java +++ b/Mage.Sets/src/mage/cards/r/RavagerWurm.java @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -34,7 +33,7 @@ public final class RavagerWurm extends CardImpl { = new FilterPermanent("land with an activated ability that isn't a mana ability"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); filter2.add(RavagerWurmPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/r/RavenousChupacabra.java b/Mage.Sets/src/mage/cards/r/RavenousChupacabra.java index 30d7d790ba0..e27010db44b 100644 --- a/Mage.Sets/src/mage/cards/r/RavenousChupacabra.java +++ b/Mage.Sets/src/mage/cards/r/RavenousChupacabra.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class RavenousChupacabra extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public RavenousChupacabra(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RayOfCommand.java b/Mage.Sets/src/mage/cards/r/RayOfCommand.java index e3790977f05..f70f0b5f9dc 100644 --- a/Mage.Sets/src/mage/cards/r/RayOfCommand.java +++ b/Mage.Sets/src/mage/cards/r/RayOfCommand.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -30,7 +29,7 @@ public final class RayOfCommand extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public RayOfCommand(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/ReachOfBranches.java b/Mage.Sets/src/mage/cards/r/ReachOfBranches.java index a4f5fa8db72..f0714b5c15d 100644 --- a/Mage.Sets/src/mage/cards/r/ReachOfBranches.java +++ b/Mage.Sets/src/mage/cards/r/ReachOfBranches.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.TreefolkShamanToken; /** @@ -24,7 +23,7 @@ public final class ReachOfBranches extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("a Forest"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.FOREST.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/r/RecklessRage.java b/Mage.Sets/src/mage/cards/r/RecklessRage.java index b39f5a9aed0..d6a16ebcc68 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessRage.java +++ b/Mage.Sets/src/mage/cards/r/RecklessRage.java @@ -7,7 +7,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.SecondTargetPointer; @@ -22,7 +21,7 @@ public final class RecklessRage extends CardImpl { // Reckless Rage deals 4 damage to target creature you don't control and 2 damage to target creature you control. FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DamageTargetEffect(4).setUseOnlyTargetPointer(true)); this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/r/ReflectorMage.java b/Mage.Sets/src/mage/cards/r/ReflectorMage.java index 51ebede343e..faabe8b4779 100644 --- a/Mage.Sets/src/mage/cards/r/ReflectorMage.java +++ b/Mage.Sets/src/mage/cards/r/ReflectorMage.java @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -30,7 +29,7 @@ public final class ReflectorMage extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ReflectorMage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RegalCaracal.java b/Mage.Sets/src/mage/cards/r/RegalCaracal.java index e6340e1a4e4..bc10d909b20 100644 --- a/Mage.Sets/src/mage/cards/r/RegalCaracal.java +++ b/Mage.Sets/src/mage/cards/r/RegalCaracal.java @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.CatToken2; /** @@ -28,7 +27,7 @@ public final class RegalCaracal extends CardImpl { static { filter.add(SubType.CAT.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public RegalCaracal(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RegisaurAlpha.java b/Mage.Sets/src/mage/cards/r/RegisaurAlpha.java index 03180cd05d6..f17b14a1668 100644 --- a/Mage.Sets/src/mage/cards/r/RegisaurAlpha.java +++ b/Mage.Sets/src/mage/cards/r/RegisaurAlpha.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.DinosaurToken; /** @@ -29,7 +28,7 @@ public final class RegisaurAlpha extends CardImpl { static { filter.add(SubType.DINOSAUR.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public RegisaurAlpha(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RelicBind.java b/Mage.Sets/src/mage/cards/r/RelicBind.java index 546f42f7214..e3f81ff0381 100644 --- a/Mage.Sets/src/mage/cards/r/RelicBind.java +++ b/Mage.Sets/src/mage/cards/r/RelicBind.java @@ -16,7 +16,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.TargetPlayer; import mage.target.common.TargetPlayerOrPlaneswalker; @@ -30,7 +29,7 @@ public final class RelicBind extends CardImpl { private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("artifact an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public RelicBind(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RequiemAngel.java b/Mage.Sets/src/mage/cards/r/RequiemAngel.java index 711b0263928..20cfb3f4dbc 100644 --- a/Mage.Sets/src/mage/cards/r/RequiemAngel.java +++ b/Mage.Sets/src/mage/cards/r/RequiemAngel.java @@ -14,7 +14,6 @@ import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.SpiritWhiteToken; /** @@ -27,7 +26,7 @@ public final class RequiemAngel extends CardImpl { static { filter.add(Predicates.not(SubType.SPIRIT.getPredicate())); filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public RequiemAngel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RevelInRiches.java b/Mage.Sets/src/mage/cards/r/RevelInRiches.java index e26d2b28ac2..b1011b4465d 100644 --- a/Mage.Sets/src/mage/cards/r/RevelInRiches.java +++ b/Mage.Sets/src/mage/cards/r/RevelInRiches.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.TreasureToken; /** @@ -30,7 +29,7 @@ public final class RevelInRiches extends CardImpl { private static final FilterPermanent filter2 = new FilterPermanent("Treasures"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filter2.add(SubType.TREASURE.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/r/RewardsOfDiversity.java b/Mage.Sets/src/mage/cards/r/RewardsOfDiversity.java index dd1270a20c0..e6e8ce0fb3d 100644 --- a/Mage.Sets/src/mage/cards/r/RewardsOfDiversity.java +++ b/Mage.Sets/src/mage/cards/r/RewardsOfDiversity.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.MulticoloredPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -21,7 +20,7 @@ public final class RewardsOfDiversity extends CardImpl { private static final FilterSpell filter = new FilterSpell("a multicolored spell"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filter.add(MulticoloredPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/r/RhythmOfTheWild.java b/Mage.Sets/src/mage/cards/r/RhythmOfTheWild.java index 85519b4e26e..42b91af749f 100644 --- a/Mage.Sets/src/mage/cards/r/RhythmOfTheWild.java +++ b/Mage.Sets/src/mage/cards/r/RhythmOfTheWild.java @@ -21,7 +21,6 @@ import mage.filter.FilterSpell; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureSpell; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.events.EntersTheBattlefieldEvent; @@ -44,7 +43,7 @@ public final class RhythmOfTheWild extends CardImpl { = new FilterControlledCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter2.add(Predicates.not(TokenPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/r/RiftElemental.java b/Mage.Sets/src/mage/cards/r/RiftElemental.java index 1118c209f98..d77795ffe20 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.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -61,7 +60,7 @@ class RiftElementalCost extends CostImpl { private static final FilterPermanentOrSuspendedCard filter = new FilterPermanentOrSuspendedCard("permanent you control with a time counter or suspended card you own"); static { - filter.getPermanentFilter().add(new ControllerPredicate(TargetController.YOU)); + filter.getPermanentFilter().add(TargetController.YOU.getControllerPredicate()); filter.getPermanentFilter().add(new CounterPredicate(CounterType.TIME)); filter.getCardFilter().add(TargetController.YOU.getOwnerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/r/RiotControl.java b/Mage.Sets/src/mage/cards/r/RiotControl.java index 21fd5448d78..2c35da41737 100644 --- a/Mage.Sets/src/mage/cards/r/RiotControl.java +++ b/Mage.Sets/src/mage/cards/r/RiotControl.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -24,7 +23,7 @@ public final class RiotControl extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public RiotControl(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java b/Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java index b83c046b5f2..ef22ba145b1 100644 --- a/Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java +++ b/Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java @@ -23,7 +23,6 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.token.GoblinSoldierToken; import mage.game.permanent.token.Token; @@ -39,7 +38,7 @@ public final class RiseOfTheHobgoblins extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Red creatures and white creatures"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(CardType.CREATURE.getPredicate()); filter.add(Predicates.or( new ColorPredicate(ObjectColor.RED), diff --git a/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java b/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java index a51c3ece190..48813c68a44 100644 --- a/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java +++ b/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java @@ -2,7 +2,7 @@ package mage.cards.r; import java.util.UUID; -import mage.MageObject; + import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -33,7 +32,7 @@ public final class RishadanPawnshop extends CardImpl { static { filter.add(Predicates.not(TokenPredicate.instance)); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public RishadanPawnshop(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RisingPopulace.java b/Mage.Sets/src/mage/cards/r/RisingPopulace.java index dfb3a35d4db..81622751329 100644 --- a/Mage.Sets/src/mage/cards/r/RisingPopulace.java +++ b/Mage.Sets/src/mage/cards/r/RisingPopulace.java @@ -12,7 +12,6 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -26,7 +25,7 @@ public final class RisingPopulace extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public RisingPopulace(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RiteOfUndoing.java b/Mage.Sets/src/mage/cards/r/RiteOfUndoing.java index f1b395748bb..5693755e90a 100644 --- a/Mage.Sets/src/mage/cards/r/RiteOfUndoing.java +++ b/Mage.Sets/src/mage/cards/r/RiteOfUndoing.java @@ -12,7 +12,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetNonlandPermanent; @@ -27,8 +26,8 @@ public final class RiteOfUndoing extends CardImpl { private static final FilterNonlandPermanent filterNotControlled = new FilterNonlandPermanent("nonland permanent you don't control"); static { - filterControlled.add(new ControllerPredicate(TargetController.YOU)); - filterNotControlled.add(new ControllerPredicate(TargetController.NOT_YOU)); + filterControlled.add(TargetController.YOU.getControllerPredicate()); + filterNotControlled.add(TargetController.NOT_YOU.getControllerPredicate()); } public RiteOfUndoing(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RiverSneak.java b/Mage.Sets/src/mage/cards/r/RiverSneak.java index cab1be8da04..e0a597f3085 100644 --- a/Mage.Sets/src/mage/cards/r/RiverSneak.java +++ b/Mage.Sets/src/mage/cards/r/RiverSneak.java @@ -15,7 +15,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -27,7 +26,7 @@ public final class RiverSneak extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.MERFOLK.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/r/RohgahhOfKherKeep.java b/Mage.Sets/src/mage/cards/r/RohgahhOfKherKeep.java index 38e6db16026..9744e077876 100644 --- a/Mage.Sets/src/mage/cards/r/RohgahhOfKherKeep.java +++ b/Mage.Sets/src/mage/cards/r/RohgahhOfKherKeep.java @@ -24,7 +24,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -41,7 +40,7 @@ public final class RohgahhOfKherKeep extends CardImpl { static { filter.add(new NamePredicate("Kobolds of Kher Keep")); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public RohgahhOfKherKeep(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RoilingWaters.java b/Mage.Sets/src/mage/cards/r/RoilingWaters.java index a6d1d69d836..7ae0ef06af4 100644 --- a/Mage.Sets/src/mage/cards/r/RoilingWaters.java +++ b/Mage.Sets/src/mage/cards/r/RoilingWaters.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.SecondTargetPointer; @@ -24,7 +23,7 @@ public final class RoilingWaters extends CardImpl { private static final FilterCreaturePermanent FILTER = new FilterCreaturePermanent("creatures your opponents control"); static { - FILTER.add(new ControllerPredicate(TargetController.OPPONENT)); + FILTER.add(TargetController.OPPONENT.getControllerPredicate()); } public RoilingWaters(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RoilmagesTrick.java b/Mage.Sets/src/mage/cards/r/RoilmagesTrick.java index 8533a961543..2515fbe8308 100644 --- a/Mage.Sets/src/mage/cards/r/RoilmagesTrick.java +++ b/Mage.Sets/src/mage/cards/r/RoilmagesTrick.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class RoilmagesTrick extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public RoilmagesTrick(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RootsOfLife.java b/Mage.Sets/src/mage/cards/r/RootsOfLife.java index c8164194652..e9db35f4ef4 100644 --- a/Mage.Sets/src/mage/cards/r/RootsOfLife.java +++ b/Mage.Sets/src/mage/cards/r/RootsOfLife.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -29,9 +28,9 @@ public final class RootsOfLife extends CardImpl { static { islandFilter.add(SubType.ISLAND.getPredicate()); - islandFilter.add(new ControllerPredicate(TargetController.OPPONENT)); + islandFilter.add(TargetController.OPPONENT.getControllerPredicate()); swampFilter.add(SubType.SWAMP.getPredicate()); - swampFilter.add(new ControllerPredicate(TargetController.OPPONENT)); + swampFilter.add(TargetController.OPPONENT.getControllerPredicate()); } public RootsOfLife(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RotShambler.java b/Mage.Sets/src/mage/cards/r/RotShambler.java index 1230e092c33..50f5728b74b 100644 --- a/Mage.Sets/src/mage/cards/r/RotShambler.java +++ b/Mage.Sets/src/mage/cards/r/RotShambler.java @@ -13,7 +13,6 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class RotShambler extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public RotShambler(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RumblingAftershocks.java b/Mage.Sets/src/mage/cards/r/RumblingAftershocks.java index 74f8e3b0255..dec1585a750 100644 --- a/Mage.Sets/src/mage/cards/r/RumblingAftershocks.java +++ b/Mage.Sets/src/mage/cards/r/RumblingAftershocks.java @@ -13,7 +13,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -31,7 +30,7 @@ public final class RumblingAftershocks extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public RumblingAftershocks(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SabaccGame.java b/Mage.Sets/src/mage/cards/s/SabaccGame.java index 4cfd1b6b467..2dbe3743c10 100644 --- a/Mage.Sets/src/mage/cards/s/SabaccGame.java +++ b/Mage.Sets/src/mage/cards/s/SabaccGame.java @@ -30,7 +30,7 @@ public final class SabaccGame extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("permanent an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public SabaccGame(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SacredWhiteDeer.java b/Mage.Sets/src/mage/cards/s/SacredWhiteDeer.java index 745393ae3f0..6fae3209d6f 100644 --- a/Mage.Sets/src/mage/cards/s/SacredWhiteDeer.java +++ b/Mage.Sets/src/mage/cards/s/SacredWhiteDeer.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -26,7 +25,7 @@ public final class SacredWhiteDeer extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("you control a Yanggu planeswalker"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(CardType.PLANESWALKER.getPredicate()); filter.add(SubType.YANGGU.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/s/SagesRowDenizen.java b/Mage.Sets/src/mage/cards/s/SagesRowDenizen.java index 2d69340779a..c7c8f646525 100644 --- a/Mage.Sets/src/mage/cards/s/SagesRowDenizen.java +++ b/Mage.Sets/src/mage/cards/s/SagesRowDenizen.java @@ -16,7 +16,6 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPlayer; /** @@ -30,7 +29,7 @@ public final class SagesRowDenizen extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.BLUE)); filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public SagesRowDenizen(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SaiOfTheShinobi.java b/Mage.Sets/src/mage/cards/s/SaiOfTheShinobi.java index 1b699038b6c..131854f3378 100644 --- a/Mage.Sets/src/mage/cards/s/SaiOfTheShinobi.java +++ b/Mage.Sets/src/mage/cards/s/SaiOfTheShinobi.java @@ -18,7 +18,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -28,7 +27,7 @@ public final class SaiOfTheShinobi extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("a creature"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public SaiOfTheShinobi(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SalvageTrader.java b/Mage.Sets/src/mage/cards/s/SalvageTrader.java index ead112bc622..9675f05a9d0 100644 --- a/Mage.Sets/src/mage/cards/s/SalvageTrader.java +++ b/Mage.Sets/src/mage/cards/s/SalvageTrader.java @@ -13,7 +13,6 @@ import mage.constants.*; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.ObjectSourcePlayer; import mage.filter.predicate.ObjectSourcePlayerPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.stack.StackObject; @@ -38,10 +37,10 @@ public final class SalvageTrader extends CardImpl { "Exchange control of target artifact you control and target artifact an opponent controls with the same converted mana cost", false, true), new TapSourceCost()); FilterArtifactPermanent filterYou = new FilterArtifactPermanent("artifact you control"); - filterYou.add(new ControllerPredicate(TargetController.YOU)); + filterYou.add(TargetController.YOU.getControllerPredicate()); ability.addTarget(new TargetArtifactPermanent(filterYou)); FilterArtifactPermanent filterOpponent = new FilterArtifactPermanent("artifact an opponent controls with the same casting cost as your targeted artifact"); - filterOpponent.add(new ControllerPredicate(TargetController.OPPONENT)); + filterOpponent.add(TargetController.OPPONENT.getControllerPredicate()); filterOpponent.add(new SameCastingCostPredicate()); ability.addTarget(new TargetArtifactPermanent(filterOpponent)); diff --git a/Mage.Sets/src/mage/cards/s/Sanctimony.java b/Mage.Sets/src/mage/cards/s/Sanctimony.java index 5f87a6edc03..a21469a416b 100644 --- a/Mage.Sets/src/mage/cards/s/Sanctimony.java +++ b/Mage.Sets/src/mage/cards/s/Sanctimony.java @@ -11,7 +11,6 @@ import mage.constants.SetTargetPointer; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -22,7 +21,7 @@ public final class Sanctimony extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("an opponent taps a Mountain"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filter.add(SubType.MOUNTAIN.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/s/SapphireCharm.java b/Mage.Sets/src/mage/cards/s/SapphireCharm.java index ca483f086ae..8a975014f40 100644 --- a/Mage.Sets/src/mage/cards/s/SapphireCharm.java +++ b/Mage.Sets/src/mage/cards/s/SapphireCharm.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; @@ -29,7 +28,7 @@ public final class SapphireCharm extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public SapphireCharm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SapphireDrake.java b/Mage.Sets/src/mage/cards/s/SapphireDrake.java index 4a23d23b85f..da4aa7e5f21 100644 --- a/Mage.Sets/src/mage/cards/s/SapphireDrake.java +++ b/Mage.Sets/src/mage/cards/s/SapphireDrake.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; /** @@ -24,7 +23,7 @@ public final class SapphireDrake extends CardImpl { static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(new CounterPredicate(CounterType.P1P1)); } diff --git a/Mage.Sets/src/mage/cards/s/SarkhansUnsealing.java b/Mage.Sets/src/mage/cards/s/SarkhansUnsealing.java index 8e07a96e41a..8763303dddb 100644 --- a/Mage.Sets/src/mage/cards/s/SarkhansUnsealing.java +++ b/Mage.Sets/src/mage/cards/s/SarkhansUnsealing.java @@ -16,7 +16,6 @@ import mage.filter.FilterSpell; import mage.filter.common.FilterCreatureSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetAnyTarget; /** @@ -37,7 +36,7 @@ public final class SarkhansUnsealing extends CardImpl { CardType.CREATURE.getPredicate(), CardType.PLANESWALKER.getPredicate() )); - filter3.add(new ControllerPredicate(TargetController.OPPONENT)); + filter3.add(TargetController.OPPONENT.getControllerPredicate()); } public SarkhansUnsealing(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SavageOffensive.java b/Mage.Sets/src/mage/cards/s/SavageOffensive.java index c7ab0b24bc5..3e8ce1dee62 100644 --- a/Mage.Sets/src/mage/cards/s/SavageOffensive.java +++ b/Mage.Sets/src/mage/cards/s/SavageOffensive.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -27,7 +26,7 @@ public final class SavageOffensive extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public SavageOffensive(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SavagePunch.java b/Mage.Sets/src/mage/cards/s/SavagePunch.java index 44ecf465790..a8d8588613a 100644 --- a/Mage.Sets/src/mage/cards/s/SavagePunch.java +++ b/Mage.Sets/src/mage/cards/s/SavagePunch.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -28,7 +27,7 @@ public final class SavagePunch extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public SavagePunch(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SavageSmash.java b/Mage.Sets/src/mage/cards/s/SavageSmash.java index feea5a1e649..6ee5657ac03 100644 --- a/Mage.Sets/src/mage/cards/s/SavageSmash.java +++ b/Mage.Sets/src/mage/cards/s/SavageSmash.java @@ -8,7 +8,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -23,7 +22,7 @@ public final class SavageSmash extends CardImpl { = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public SavageSmash(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SavageStomp.java b/Mage.Sets/src/mage/cards/s/SavageStomp.java index 0b03f1085ee..77c4d860170 100644 --- a/Mage.Sets/src/mage/cards/s/SavageStomp.java +++ b/Mage.Sets/src/mage/cards/s/SavageStomp.java @@ -18,7 +18,6 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -36,7 +35,7 @@ public final class SavageStomp extends CardImpl { = new FilterControlledCreaturePermanent(SubType.DINOSAUR, "a Dinosaur you control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } private static final Condition condition = new SourceTargetsPermanentCondition(filter2); diff --git a/Mage.Sets/src/mage/cards/s/SavageSwipe.java b/Mage.Sets/src/mage/cards/s/SavageSwipe.java index 40359b6849a..c1aee533be0 100644 --- a/Mage.Sets/src/mage/cards/s/SavageSwipe.java +++ b/Mage.Sets/src/mage/cards/s/SavageSwipe.java @@ -13,7 +13,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -30,7 +29,7 @@ public final class SavageSwipe extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public SavageSwipe(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ScabClanGiant.java b/Mage.Sets/src/mage/cards/s/ScabClanGiant.java index 7b3b6577482..d5603a0aab7 100644 --- a/Mage.Sets/src/mage/cards/s/ScabClanGiant.java +++ b/Mage.Sets/src/mage/cards/s/ScabClanGiant.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.Target; @@ -27,7 +26,7 @@ public final class ScabClanGiant extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ScabClanGiant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ScionOfOona.java b/Mage.Sets/src/mage/cards/s/ScionOfOona.java index e0ec553bf37..dcfab86ab33 100644 --- a/Mage.Sets/src/mage/cards/s/ScionOfOona.java +++ b/Mage.Sets/src/mage/cards/s/ScionOfOona.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -27,9 +26,9 @@ public final class ScionOfOona extends CardImpl { static { filter.add(SubType.FAERIE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filterCreature.add(SubType.FAERIE.getPredicate()); - filterCreature.add(new ControllerPredicate(TargetController.YOU)); + filterCreature.add(TargetController.YOU.getControllerPredicate()); } public ScionOfOona(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ScourgeOfFleets.java b/Mage.Sets/src/mage/cards/s/ScourgeOfFleets.java index 73b8fa04727..b479986e674 100644 --- a/Mage.Sets/src/mage/cards/s/ScourgeOfFleets.java +++ b/Mage.Sets/src/mage/cards/s/ScourgeOfFleets.java @@ -15,7 +15,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ToughnessPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -75,7 +74,7 @@ class ScourgeOfFleetsEffect extends OneShotEffect { if (controller != null) { int islands = game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game); FilterPermanent creatureFilter = new FilterCreaturePermanent(); - creatureFilter.add(new ControllerPredicate(TargetController.OPPONENT)); + creatureFilter.add(TargetController.OPPONENT.getControllerPredicate()); creatureFilter.add(new ToughnessPredicate(ComparisonType.FEWER_THAN, islands + 1)); Cards cardsToHand = new CardsImpl(); for (Permanent permanent : game.getBattlefield().getActivePermanents(creatureFilter, source.getControllerId(), source.getSourceId(), game)) { diff --git a/Mage.Sets/src/mage/cards/s/ScourgeOfGeierReach.java b/Mage.Sets/src/mage/cards/s/ScourgeOfGeierReach.java index 5454e2eb0c9..33f3ff296f3 100644 --- a/Mage.Sets/src/mage/cards/s/ScourgeOfGeierReach.java +++ b/Mage.Sets/src/mage/cards/s/ScourgeOfGeierReach.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class ScourgeOfGeierReach extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("for each creature your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ScourgeOfGeierReach(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ScouringSands.java b/Mage.Sets/src/mage/cards/s/ScouringSands.java index 03a5fb0ef48..77909b9b946 100644 --- a/Mage.Sets/src/mage/cards/s/ScouringSands.java +++ b/Mage.Sets/src/mage/cards/s/ScouringSands.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -46,7 +45,7 @@ class ScouringSandsDamageEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ScouringSandsDamageEffect() { diff --git a/Mage.Sets/src/mage/cards/s/SealAway.java b/Mage.Sets/src/mage/cards/s/SealAway.java index 9ad8ab7f25a..5f3a3661282 100644 --- a/Mage.Sets/src/mage/cards/s/SealAway.java +++ b/Mage.Sets/src/mage/cards/s/SealAway.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; @@ -27,7 +26,7 @@ public final class SealAway extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filter.add(TappedPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/s/SeascapeAerialist.java b/Mage.Sets/src/mage/cards/s/SeascapeAerialist.java index 9621a1c233f..7c197ee7fb2 100644 --- a/Mage.Sets/src/mage/cards/s/SeascapeAerialist.java +++ b/Mage.Sets/src/mage/cards/s/SeascapeAerialist.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class SeascapeAerialist extends CardImpl { static { filter.add(SubType.ALLY.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public SeascapeAerialist(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/Seasinger.java b/Mage.Sets/src/mage/cards/s/Seasinger.java index 4c11309b149..5371fba1e14 100644 --- a/Mage.Sets/src/mage/cards/s/Seasinger.java +++ b/Mage.Sets/src/mage/cards/s/Seasinger.java @@ -21,7 +21,6 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.CardIdPredicate; import mage.filter.predicate.permanent.ControllerControlsIslandPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -36,7 +35,7 @@ public final class Seasinger extends CardImpl { static { islandYouControl.add(SubType.ISLAND.getPredicate()); - islandYouControl.add(new ControllerPredicate(TargetController.YOU)); + islandYouControl.add(TargetController.YOU.getControllerPredicate()); } public Seasinger(UUID ownerId, CardSetInfo setInfo) { @@ -47,7 +46,7 @@ public final class Seasinger extends CardImpl { this.toughness = new MageInt(1); FilterPermanent seasinger = new FilterPermanent(); - seasinger.add(new ControllerPredicate(TargetController.YOU)); + seasinger.add(TargetController.YOU.getControllerPredicate()); seasinger.add(new CardIdPredicate(this.getId())); // When you control no Islands, sacrifice Seasinger. diff --git a/Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java b/Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java index 202bb00e802..384355c3872 100644 --- a/Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java +++ b/Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java @@ -14,7 +14,6 @@ import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.SekKuarDeathkeeperGravebornToken; @@ -27,7 +26,7 @@ public final class SekKuarDeathkeeper extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another nontoken creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); filter.add(Predicates.not(TokenPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/s/SelfInflictedWound.java b/Mage.Sets/src/mage/cards/s/SelfInflictedWound.java index dd6caca7c7c..a78d9bbcaf2 100644 --- a/Mage.Sets/src/mage/cards/s/SelfInflictedWound.java +++ b/Mage.Sets/src/mage/cards/s/SelfInflictedWound.java @@ -13,7 +13,6 @@ import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -70,7 +69,7 @@ class SelfInflictedWoundEffect extends OneShotEffect { } FilterControlledPermanent filter = new FilterControlledPermanent("a green or white creature"); filter.add(CardType.CREATURE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.or(new ColorPredicate(ObjectColor.GREEN), new ColorPredicate(ObjectColor.WHITE))); TargetControlledPermanent target = new TargetControlledPermanent(1, 1, filter, true); diff --git a/Mage.Sets/src/mage/cards/s/SettleBeyondReality.java b/Mage.Sets/src/mage/cards/s/SettleBeyondReality.java index a9d2bf69cab..7abb90d3690 100644 --- a/Mage.Sets/src/mage/cards/s/SettleBeyondReality.java +++ b/Mage.Sets/src/mage/cards/s/SettleBeyondReality.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -24,7 +23,7 @@ public final class SettleBeyondReality extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public SettleBeyondReality(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShamanOfThePack.java b/Mage.Sets/src/mage/cards/s/ShamanOfThePack.java index 8395a42ca4c..167160264fd 100644 --- a/Mage.Sets/src/mage/cards/s/ShamanOfThePack.java +++ b/Mage.Sets/src/mage/cards/s/ShamanOfThePack.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetOpponent; /** @@ -26,7 +25,7 @@ public final class ShamanOfThePack extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("equal to the number of elves you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.ELF.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/s/ShamblingGoblin.java b/Mage.Sets/src/mage/cards/s/ShamblingGoblin.java index 7eb98bfdfe7..ed512bf60f0 100644 --- a/Mage.Sets/src/mage/cards/s/ShamblingGoblin.java +++ b/Mage.Sets/src/mage/cards/s/ShamblingGoblin.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -25,7 +24,7 @@ public final class ShamblingGoblin extends CardImpl { private static final FilterCreaturePermanent filterOpponentCreature = new FilterCreaturePermanent("creature an opponent controls"); static { - filterOpponentCreature.add(new ControllerPredicate(TargetController.OPPONENT)); + filterOpponentCreature.add(TargetController.OPPONENT.getControllerPredicate()); } public ShamblingGoblin(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShamblingSuit.java b/Mage.Sets/src/mage/cards/s/ShamblingSuit.java index 43efe5a3805..995c03a48e9 100644 --- a/Mage.Sets/src/mage/cards/s/ShamblingSuit.java +++ b/Mage.Sets/src/mage/cards/s/ShamblingSuit.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -23,7 +22,7 @@ public final class ShamblingSuit extends CardImpl { = new FilterArtifactOrEnchantmentPermanent("artifacts and/or enchantments you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } private static final DynamicValue xValue = new PermanentsOnBattlefieldCount(filter); diff --git a/Mage.Sets/src/mage/cards/s/ShatteredAngel.java b/Mage.Sets/src/mage/cards/s/ShatteredAngel.java index 16fc1675a18..4e894aa6295 100644 --- a/Mage.Sets/src/mage/cards/s/ShatteredAngel.java +++ b/Mage.Sets/src/mage/cards/s/ShatteredAngel.java @@ -15,7 +15,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class ShatteredAngel extends CardImpl { private static final FilterPermanent filter = new FilterLandPermanent("a land"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ShatteredAngel (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShelteringAncient.java b/Mage.Sets/src/mage/cards/s/ShelteringAncient.java index 31b1210dccd..7dbbe50516b 100644 --- a/Mage.Sets/src/mage/cards/s/ShelteringAncient.java +++ b/Mage.Sets/src/mage/cards/s/ShelteringAncient.java @@ -16,7 +16,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -57,7 +56,7 @@ class ShelteringAncientCost extends CostImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } ShelteringAncientCost() { diff --git a/Mage.Sets/src/mage/cards/s/ShieldMare.java b/Mage.Sets/src/mage/cards/s/ShieldMare.java index b75a0b10d09..87b88ec1f98 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldMare.java +++ b/Mage.Sets/src/mage/cards/s/ShieldMare.java @@ -17,7 +17,6 @@ import mage.constants.Zone; import mage.filter.FilterStackObject; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -69,7 +68,7 @@ class ShieldMareTriggeredAbility extends TriggeredAbilityImpl { private static final FilterStackObject filter = new FilterStackObject(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ShieldMareTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/s/ShipwreckSinger.java b/Mage.Sets/src/mage/cards/s/ShipwreckSinger.java index de016872aea..37b66072c0d 100644 --- a/Mage.Sets/src/mage/cards/s/ShipwreckSinger.java +++ b/Mage.Sets/src/mage/cards/s/ShipwreckSinger.java @@ -19,7 +19,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AttackingPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; @@ -32,7 +31,7 @@ public final class ShipwreckSinger extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); private static final FilterCreaturePermanent filterAttacking = new FilterCreaturePermanent("Attacking creatures"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filterAttacking.add(AttackingPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/s/ShorelineSalvager.java b/Mage.Sets/src/mage/cards/s/ShorelineSalvager.java index ce52e39421c..1e37d5eb754 100644 --- a/Mage.Sets/src/mage/cards/s/ShorelineSalvager.java +++ b/Mage.Sets/src/mage/cards/s/ShorelineSalvager.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class ShorelineSalvager extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Island"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.ISLAND.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/s/Showstopper.java b/Mage.Sets/src/mage/cards/s/Showstopper.java index bdf35b94835..ff46adbe76e 100644 --- a/Mage.Sets/src/mage/cards/s/Showstopper.java +++ b/Mage.Sets/src/mage/cards/s/Showstopper.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; @@ -29,7 +28,7 @@ public final class Showstopper extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creatures you control"); private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creature an opponent controls"); static { - filter2.add(new ControllerPredicate(TargetController.OPPONENT)); + filter2.add(TargetController.OPPONENT.getControllerPredicate()); } public Showstopper (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShrewdHatchling.java b/Mage.Sets/src/mage/cards/s/ShrewdHatchling.java index b4b36b3e2be..6b666ea4906 100644 --- a/Mage.Sets/src/mage/cards/s/ShrewdHatchling.java +++ b/Mage.Sets/src/mage/cards/s/ShrewdHatchling.java @@ -16,7 +16,6 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -32,9 +31,9 @@ public final class ShrewdHatchling extends CardImpl { private static final FilterSpell filter2 = new FilterSpell("red spell"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(new ColorPredicate(ObjectColor.BLUE)); - filter2.add(new ControllerPredicate(TargetController.YOU)); + filter2.add(TargetController.YOU.getControllerPredicate()); filter2.add(new ColorPredicate(ObjectColor.RED)); } diff --git a/Mage.Sets/src/mage/cards/s/ShrewdNegotiation.java b/Mage.Sets/src/mage/cards/s/ShrewdNegotiation.java index 573fbde3f11..de549236014 100644 --- a/Mage.Sets/src/mage/cards/s/ShrewdNegotiation.java +++ b/Mage.Sets/src/mage/cards/s/ShrewdNegotiation.java @@ -11,7 +11,6 @@ import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledArtifactPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; @@ -26,7 +25,7 @@ public final class ShrewdNegotiation extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("artifact or creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); filter.add(Predicates.or(CardType.ARTIFACT.getPredicate(), CardType.CREATURE.getPredicate())); } diff --git a/Mage.Sets/src/mage/cards/s/SiegeDragon.java b/Mage.Sets/src/mage/cards/s/SiegeDragon.java index 46d343517a0..8bfca003544 100644 --- a/Mage.Sets/src/mage/cards/s/SiegeDragon.java +++ b/Mage.Sets/src/mage/cards/s/SiegeDragon.java @@ -17,7 +17,6 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -33,7 +32,7 @@ public final class SiegeDragon extends CardImpl { static { filter.add(SubType.WALL.getPredicate()); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public SiegeDragon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SifterOfSkulls.java b/Mage.Sets/src/mage/cards/s/SifterOfSkulls.java index cf4e0048679..b98e6da22cb 100644 --- a/Mage.Sets/src/mage/cards/s/SifterOfSkulls.java +++ b/Mage.Sets/src/mage/cards/s/SifterOfSkulls.java @@ -15,7 +15,6 @@ import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.EldraziScionToken; @@ -27,7 +26,7 @@ public final class SifterOfSkulls extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another nontoken creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); filter.add(Predicates.not(TokenPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/s/SightOfTheScalelords.java b/Mage.Sets/src/mage/cards/s/SightOfTheScalelords.java index e58b366b98e..f909ef0e266 100644 --- a/Mage.Sets/src/mage/cards/s/SightOfTheScalelords.java +++ b/Mage.Sets/src/mage/cards/s/SightOfTheScalelords.java @@ -17,7 +17,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ToughnessPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -28,7 +27,7 @@ public final class SightOfTheScalelords extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control with toughness 4 or greater"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(new ToughnessPredicate(ComparisonType.MORE_THAN, 3)); } diff --git a/Mage.Sets/src/mage/cards/s/Silkwrap.java b/Mage.Sets/src/mage/cards/s/Silkwrap.java index c76a69d0269..c66e8cea0de 100644 --- a/Mage.Sets/src/mage/cards/s/Silkwrap.java +++ b/Mage.Sets/src/mage/cards/s/Silkwrap.java @@ -16,7 +16,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -32,7 +31,7 @@ public final class Silkwrap extends CardImpl { static { filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public Silkwrap(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SilumgarAssassin.java b/Mage.Sets/src/mage/cards/s/SilumgarAssassin.java index 4d1d8837a65..e0e061f2f39 100644 --- a/Mage.Sets/src/mage/cards/s/SilumgarAssassin.java +++ b/Mage.Sets/src/mage/cards/s/SilumgarAssassin.java @@ -19,7 +19,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -32,7 +31,7 @@ public final class SilumgarAssassin extends CardImpl { static { filter.add(new PowerPredicate(ComparisonType.FEWER_THAN, 4)); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public SilumgarAssassin(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SilumgarScavenger.java b/Mage.Sets/src/mage/cards/s/SilumgarScavenger.java index dfe6278b0ac..54a50475cc1 100644 --- a/Mage.Sets/src/mage/cards/s/SilumgarScavenger.java +++ b/Mage.Sets/src/mage/cards/s/SilumgarScavenger.java @@ -16,7 +16,6 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -35,7 +34,7 @@ public final class SilumgarScavenger extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public SilumgarScavenger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SilumgarTheDriftingDeath.java b/Mage.Sets/src/mage/cards/s/SilumgarTheDriftingDeath.java index e7daa610796..3ec0f5b441b 100644 --- a/Mage.Sets/src/mage/cards/s/SilumgarTheDriftingDeath.java +++ b/Mage.Sets/src/mage/cards/s/SilumgarTheDriftingDeath.java @@ -15,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -29,7 +28,7 @@ public final class SilumgarTheDriftingDeath extends CardImpl { static { filter.add(SubType.DRAGON.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public SilumgarTheDriftingDeath(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SireOfStagnation.java b/Mage.Sets/src/mage/cards/s/SireOfStagnation.java index f2ea26090af..94768f61cf8 100644 --- a/Mage.Sets/src/mage/cards/s/SireOfStagnation.java +++ b/Mage.Sets/src/mage/cards/s/SireOfStagnation.java @@ -16,7 +16,6 @@ import mage.constants.SetTargetPointer; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -28,7 +27,7 @@ public final class SireOfStagnation extends CardImpl { private static final String rule = "Whenever a land enters the battlefield under an opponent's control, that player exiles the top two cards of their library and you draw two cards."; static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public SireOfStagnation(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SkirkAlarmist.java b/Mage.Sets/src/mage/cards/s/SkirkAlarmist.java index 72d6ed3a653..dbe1cb8a2c2 100644 --- a/Mage.Sets/src/mage/cards/s/SkirkAlarmist.java +++ b/Mage.Sets/src/mage/cards/s/SkirkAlarmist.java @@ -20,7 +20,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.other.FaceDownPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -36,7 +35,7 @@ public final class SkirkAlarmist extends CardImpl { static { filter.add(FaceDownPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public SkirkAlarmist(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SkittishKavu.java b/Mage.Sets/src/mage/cards/s/SkittishKavu.java index 0a3eb72ca70..3e4bccc41ac 100644 --- a/Mage.Sets/src/mage/cards/s/SkittishKavu.java +++ b/Mage.Sets/src/mage/cards/s/SkittishKavu.java @@ -20,7 +20,6 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -32,7 +31,7 @@ public final class SkittishKavu extends CardImpl { static { filter.add(Predicates.or(new ColorPredicate(ObjectColor.WHITE), new ColorPredicate(ObjectColor.BLUE))); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public SkittishKavu(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/Skulduggery.java b/Mage.Sets/src/mage/cards/s/Skulduggery.java index 9ae94dd0346..7ccb7bdea07 100644 --- a/Mage.Sets/src/mage/cards/s/Skulduggery.java +++ b/Mage.Sets/src/mage/cards/s/Skulduggery.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -29,7 +28,7 @@ public final class Skulduggery extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public Skulduggery(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SkylineCascade.java b/Mage.Sets/src/mage/cards/s/SkylineCascade.java index cdd70037b11..3cd45f697c4 100644 --- a/Mage.Sets/src/mage/cards/s/SkylineCascade.java +++ b/Mage.Sets/src/mage/cards/s/SkylineCascade.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class SkylineCascade extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public SkylineCascade(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SkysovereignConsulFlagship.java b/Mage.Sets/src/mage/cards/s/SkysovereignConsulFlagship.java index 3a629ee2234..204c3d38076 100644 --- a/Mage.Sets/src/mage/cards/s/SkysovereignConsulFlagship.java +++ b/Mage.Sets/src/mage/cards/s/SkysovereignConsulFlagship.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreatureOrPlaneswalker; import java.util.UUID; @@ -27,7 +26,7 @@ public final class SkysovereignConsulFlagship extends CardImpl { private static final FilterCreatureOrPlaneswalkerPermanent filter = new FilterCreatureOrPlaneswalkerPermanent("creature or planeswalker an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public SkysovereignConsulFlagship(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SlitheryStalker.java b/Mage.Sets/src/mage/cards/s/SlitheryStalker.java index 350c5809939..3f148af258b 100644 --- a/Mage.Sets/src/mage/cards/s/SlitheryStalker.java +++ b/Mage.Sets/src/mage/cards/s/SlitheryStalker.java @@ -19,7 +19,6 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.TargetPermanent; @@ -35,7 +34,7 @@ public final class SlitheryStalker extends CardImpl { filter.add(Predicates.or( new ColorPredicate(ObjectColor.GREEN), new ColorPredicate(ObjectColor.WHITE))); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public SlitheryStalker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SludgeStrider.java b/Mage.Sets/src/mage/cards/s/SludgeStrider.java index fb389b73932..d2bcdfb73f0 100644 --- a/Mage.Sets/src/mage/cards/s/SludgeStrider.java +++ b/Mage.Sets/src/mage/cards/s/SludgeStrider.java @@ -60,7 +60,7 @@ class SludgeStriderTriggeredAbility extends TriggeredAbilityImpl { private static final FilterArtifactCard filter = new FilterArtifactCard("another artifact under your control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/s/SmeltWardGatekeepers.java b/Mage.Sets/src/mage/cards/s/SmeltWardGatekeepers.java index 83fd167042f..9954857299b 100644 --- a/Mage.Sets/src/mage/cards/s/SmeltWardGatekeepers.java +++ b/Mage.Sets/src/mage/cards/s/SmeltWardGatekeepers.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; @@ -34,7 +33,7 @@ public final class SmeltWardGatekeepers extends CardImpl { static { filter.add(SubType.GATE.getPredicate()); - targetFilter.add(new ControllerPredicate(TargetController.OPPONENT)); + targetFilter.add(TargetController.OPPONENT.getControllerPredicate()); } private static final Condition gatesCondition = new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 1); diff --git a/Mage.Sets/src/mage/cards/s/SmogElemental.java b/Mage.Sets/src/mage/cards/s/SmogElemental.java index a858f1ab061..2e67b9f956e 100644 --- a/Mage.Sets/src/mage/cards/s/SmogElemental.java +++ b/Mage.Sets/src/mage/cards/s/SmogElemental.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -21,7 +20,7 @@ public final class SmogElemental extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures with flying your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filter.add(new AbilityPredicate(FlyingAbility.class)); } diff --git a/Mage.Sets/src/mage/cards/s/SoldeviGolem.java b/Mage.Sets/src/mage/cards/s/SoldeviGolem.java index b2c0364d087..5e9205c53e7 100644 --- a/Mage.Sets/src/mage/cards/s/SoldeviGolem.java +++ b/Mage.Sets/src/mage/cards/s/SoldeviGolem.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetCreaturePermanent; @@ -29,7 +28,7 @@ public final class SoldeviGolem extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filter.add(TappedPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/s/SomberwaldAlpha.java b/Mage.Sets/src/mage/cards/s/SomberwaldAlpha.java index 00bc7f78f48..dac60ce2880 100644 --- a/Mage.Sets/src/mage/cards/s/SomberwaldAlpha.java +++ b/Mage.Sets/src/mage/cards/s/SomberwaldAlpha.java @@ -19,7 +19,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -31,7 +30,7 @@ public final class SomberwaldAlpha extends CardImpl { static final private FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public SomberwaldAlpha(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SomberwaldStag.java b/Mage.Sets/src/mage/cards/s/SomberwaldStag.java index 6a39ddb820e..5ed035681a7 100644 --- a/Mage.Sets/src/mage/cards/s/SomberwaldStag.java +++ b/Mage.Sets/src/mage/cards/s/SomberwaldStag.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -25,7 +24,7 @@ public final class SomberwaldStag extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public SomberwaldStag(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SoulswornSpirit.java b/Mage.Sets/src/mage/cards/s/SoulswornSpirit.java index 5fcd2305831..d1303314813 100644 --- a/Mage.Sets/src/mage/cards/s/SoulswornSpirit.java +++ b/Mage.Sets/src/mage/cards/s/SoulswornSpirit.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -25,7 +24,7 @@ public final class SoulswornSpirit extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public SoulswornSpirit(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SoultetherGolem.java b/Mage.Sets/src/mage/cards/s/SoultetherGolem.java index 3c449c87704..74e41f74f1b 100644 --- a/Mage.Sets/src/mage/cards/s/SoultetherGolem.java +++ b/Mage.Sets/src/mage/cards/s/SoultetherGolem.java @@ -18,7 +18,6 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -29,7 +28,7 @@ public final class SoultetherGolem extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/s/Spawnbroker.java b/Mage.Sets/src/mage/cards/s/Spawnbroker.java index 39bde3f3302..ac19eb3c571 100644 --- a/Mage.Sets/src/mage/cards/s/Spawnbroker.java +++ b/Mage.Sets/src/mage/cards/s/Spawnbroker.java @@ -17,7 +17,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.TargetController; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -96,7 +95,7 @@ class SpawnbrokerSecondTarget extends TargetPermanent { public SpawnbrokerSecondTarget() { super(); this.filter = this.filter.copy(); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filter.add(CardType.CREATURE.getPredicate()); setTargetName("creature with power less than or equal to that creature's power an opponent controls"); } diff --git a/Mage.Sets/src/mage/cards/s/SpectralGrasp.java b/Mage.Sets/src/mage/cards/s/SpectralGrasp.java index a6afd7702ea..d54bafe59c4 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralGrasp.java +++ b/Mage.Sets/src/mage/cards/s/SpectralGrasp.java @@ -18,7 +18,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -31,7 +30,7 @@ public final class SpectralGrasp extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public SpectralGrasp(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpectralShepherd.java b/Mage.Sets/src/mage/cards/s/SpectralShepherd.java index c0426651879..9895cb0f16b 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralShepherd.java +++ b/Mage.Sets/src/mage/cards/s/SpectralShepherd.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledPermanent; /** @@ -27,7 +26,7 @@ public final class SpectralShepherd extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Spirit"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.SPIRIT.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/s/SpellSyphon.java b/Mage.Sets/src/mage/cards/s/SpellSyphon.java index 517ab20693c..d756b28f2fc 100644 --- a/Mage.Sets/src/mage/cards/s/SpellSyphon.java +++ b/Mage.Sets/src/mage/cards/s/SpellSyphon.java @@ -12,7 +12,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.stack.StackObject; import mage.players.Player; @@ -52,7 +51,7 @@ class SpellSyphonEffect extends OneShotEffect { static { filter.add(new ColorPredicate(ObjectColor.BLUE)); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public SpellSyphonEffect() { diff --git a/Mage.Sets/src/mage/cards/s/SpinalEmbrace.java b/Mage.Sets/src/mage/cards/s/SpinalEmbrace.java index 49a9d659e64..ba31d7abda6 100644 --- a/Mage.Sets/src/mage/cards/s/SpinalEmbrace.java +++ b/Mage.Sets/src/mage/cards/s/SpinalEmbrace.java @@ -20,7 +20,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.TurnPhase; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -36,7 +35,7 @@ public final class SpinalEmbrace extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public SpinalEmbrace(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpireBarrage.java b/Mage.Sets/src/mage/cards/s/SpireBarrage.java index e4a6c320587..0be428f27e5 100644 --- a/Mage.Sets/src/mage/cards/s/SpireBarrage.java +++ b/Mage.Sets/src/mage/cards/s/SpireBarrage.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetAnyTarget; /** @@ -23,7 +22,7 @@ public final class SpireBarrage extends CardImpl { static { filter.add(SubType.MOUNTAIN.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public SpireBarrage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpiresOfOrazca.java b/Mage.Sets/src/mage/cards/s/SpiresOfOrazca.java index c6651fc0fe3..23022af6534 100644 --- a/Mage.Sets/src/mage/cards/s/SpiresOfOrazca.java +++ b/Mage.Sets/src/mage/cards/s/SpiresOfOrazca.java @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AttackingPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -29,7 +28,7 @@ public final class SpiresOfOrazca extends CardImpl { static { filter.add(AttackingPredicate.instance); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public SpiresOfOrazca(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpiritFlare.java b/Mage.Sets/src/mage/cards/s/SpiritFlare.java index c2b78762f6b..cf1d2c8aa5a 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritFlare.java +++ b/Mage.Sets/src/mage/cards/s/SpiritFlare.java @@ -15,7 +15,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterAttackingOrBlockingCreature; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -35,7 +34,7 @@ public final class SpiritFlare extends CardImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter2.add(new ControllerPredicate(TargetController.OPPONENT)); + filter2.add(TargetController.OPPONENT.getControllerPredicate()); } public SpiritFlare(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpiritualAsylum.java b/Mage.Sets/src/mage/cards/s/SpiritualAsylum.java index 031b592e8a2..23804f9c1ec 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritualAsylum.java +++ b/Mage.Sets/src/mage/cards/s/SpiritualAsylum.java @@ -15,7 +15,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -30,7 +29,7 @@ public final class SpiritualAsylum extends CardImpl { CardType.CREATURE.getPredicate(), CardType.LAND.getPredicate() )); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public SpiritualAsylum(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpiritualSanctuary.java b/Mage.Sets/src/mage/cards/s/SpiritualSanctuary.java index c7871c5a969..8ae4a5eb6c3 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritualSanctuary.java +++ b/Mage.Sets/src/mage/cards/s/SpiritualSanctuary.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -24,7 +23,7 @@ public final class SpiritualSanctuary extends CardImpl { static { filter.add(SubType.PLAINS.getPredicate()); - filter.add(new ControllerPredicate(TargetController.ACTIVE)); + filter.add(TargetController.ACTIVE.getControllerPredicate()); } public SpiritualSanctuary(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SporesowerThallid.java b/Mage.Sets/src/mage/cards/s/SporesowerThallid.java index 61d948e54a8..fe3b1dbb43a 100644 --- a/Mage.Sets/src/mage/cards/s/SporesowerThallid.java +++ b/Mage.Sets/src/mage/cards/s/SporesowerThallid.java @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.SaprolingToken; /** @@ -27,7 +26,7 @@ public final class SporesowerThallid extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Fungus you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.FUNGUS.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/s/SpringCleaning.java b/Mage.Sets/src/mage/cards/s/SpringCleaning.java index 474903ca4c5..fdff0507187 100644 --- a/Mage.Sets/src/mage/cards/s/SpringCleaning.java +++ b/Mage.Sets/src/mage/cards/s/SpringCleaning.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterEnchantmentPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetEnchantmentPermanent; /** @@ -22,7 +21,7 @@ public final class SpringCleaning extends CardImpl { private static final FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent("enchantments your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public SpringCleaning(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/StalkingVengeance.java b/Mage.Sets/src/mage/cards/s/StalkingVengeance.java index b51f4e9fcce..f3d6d921ddf 100644 --- a/Mage.Sets/src/mage/cards/s/StalkingVengeance.java +++ b/Mage.Sets/src/mage/cards/s/StalkingVengeance.java @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetPlayerOrPlaneswalker; @@ -30,7 +29,7 @@ public final class StalkingVengeance extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java b/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java index 713c2cf2a3a..8a4ef440590 100644 --- a/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java +++ b/Mage.Sets/src/mage/cards/s/StarfieldOfNyx.java @@ -20,7 +20,6 @@ import mage.filter.FilterCard; import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCardInGraveyard; @@ -40,7 +39,7 @@ public final class StarfieldOfNyx extends CardImpl { = new FilterEnchantmentPermanent("enchantment you control"); static { - filterEnchantmentYouControl.add(new ControllerPredicate(TargetController.YOU)); + filterEnchantmentYouControl.add(TargetController.YOU.getControllerPredicate()); } static { @@ -85,7 +84,7 @@ class StarfieldOfNyxEffect extends ContinuousEffectImpl { static { filter.add(Predicates.not(SubType.AURA.getPredicate())); filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public StarfieldOfNyxEffect() { diff --git a/Mage.Sets/src/mage/cards/s/StasisSnare.java b/Mage.Sets/src/mage/cards/s/StasisSnare.java index fe7447f46cb..0af6851a75c 100644 --- a/Mage.Sets/src/mage/cards/s/StasisSnare.java +++ b/Mage.Sets/src/mage/cards/s/StasisSnare.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -25,7 +24,7 @@ public final class StasisSnare extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public StasisSnare(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SteelOverseer.java b/Mage.Sets/src/mage/cards/s/SteelOverseer.java index 827ce1bb5a7..3817002c97d 100644 --- a/Mage.Sets/src/mage/cards/s/SteelOverseer.java +++ b/Mage.Sets/src/mage/cards/s/SteelOverseer.java @@ -15,7 +15,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -28,7 +27,7 @@ public final class SteelOverseer extends CardImpl { static { filter.add(CardType.ARTIFACT.getPredicate()); filter.add(CardType.CREATURE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public SteelOverseer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/StensiaInnkeeper.java b/Mage.Sets/src/mage/cards/s/StensiaInnkeeper.java index f6c5033a8ed..79414e30291 100644 --- a/Mage.Sets/src/mage/cards/s/StensiaInnkeeper.java +++ b/Mage.Sets/src/mage/cards/s/StensiaInnkeeper.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; /** @@ -25,7 +24,7 @@ public final class StensiaInnkeeper extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("land an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public StensiaInnkeeper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/Stingscourger.java b/Mage.Sets/src/mage/cards/s/Stingscourger.java index 5ffd3451cdd..ba13370aafb 100644 --- a/Mage.Sets/src/mage/cards/s/Stingscourger.java +++ b/Mage.Sets/src/mage/cards/s/Stingscourger.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -25,7 +24,7 @@ public final class Stingscourger extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public Stingscourger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/StitchedMangler.java b/Mage.Sets/src/mage/cards/s/StitchedMangler.java index 6bab4d9e7f2..d62eddad26f 100644 --- a/Mage.Sets/src/mage/cards/s/StitchedMangler.java +++ b/Mage.Sets/src/mage/cards/s/StitchedMangler.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -26,7 +25,7 @@ public final class StitchedMangler extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public StitchedMangler(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/StoneHavenOutfitter.java b/Mage.Sets/src/mage/cards/s/StoneHavenOutfitter.java index 99f376716ed..5fd8de71ccb 100644 --- a/Mage.Sets/src/mage/cards/s/StoneHavenOutfitter.java +++ b/Mage.Sets/src/mage/cards/s/StoneHavenOutfitter.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.EquippedPredicate; /** @@ -28,7 +27,7 @@ public final class StoneHavenOutfitter extends CardImpl { static { filter.add(EquippedPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public StoneHavenOutfitter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/StonehoofChieftain.java b/Mage.Sets/src/mage/cards/s/StonehoofChieftain.java index fbd63a49a5c..82428b8af80 100644 --- a/Mage.Sets/src/mage/cards/s/StonehoofChieftain.java +++ b/Mage.Sets/src/mage/cards/s/StonehoofChieftain.java @@ -17,7 +17,6 @@ import mage.constants.SetTargetPointer; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -28,7 +27,7 @@ public final class StonehoofChieftain extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/s/StoneshockGiant.java b/Mage.Sets/src/mage/cards/s/StoneshockGiant.java index df8375ab860..0d661881ee1 100644 --- a/Mage.Sets/src/mage/cards/s/StoneshockGiant.java +++ b/Mage.Sets/src/mage/cards/s/StoneshockGiant.java @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -26,7 +25,7 @@ public final class StoneshockGiant extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures without flying your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filter.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); } diff --git a/Mage.Sets/src/mage/cards/s/StreetSpasm.java b/Mage.Sets/src/mage/cards/s/StreetSpasm.java index e10d340862f..6fcbcb5f4fa 100644 --- a/Mage.Sets/src/mage/cards/s/StreetSpasm.java +++ b/Mage.Sets/src/mage/cards/s/StreetSpasm.java @@ -15,7 +15,6 @@ import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -27,7 +26,7 @@ public final class StreetSpasm extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature without flying you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); filter.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); } diff --git a/Mage.Sets/src/mage/cards/s/StromkirkCondemned.java b/Mage.Sets/src/mage/cards/s/StromkirkCondemned.java index f43f1991ed2..c15c81d9961 100644 --- a/Mage.Sets/src/mage/cards/s/StromkirkCondemned.java +++ b/Mage.Sets/src/mage/cards/s/StromkirkCondemned.java @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -22,7 +21,7 @@ public final class StromkirkCondemned extends CardImpl { static { filter.add(SubType.VAMPIRE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public StromkirkCondemned(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SubjugatorAngel.java b/Mage.Sets/src/mage/cards/s/SubjugatorAngel.java index aa2b3c4bd7a..afb7f685543 100644 --- a/Mage.Sets/src/mage/cards/s/SubjugatorAngel.java +++ b/Mage.Sets/src/mage/cards/s/SubjugatorAngel.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -23,7 +22,7 @@ public final class SubjugatorAngel extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public SubjugatorAngel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SultaiFlayer.java b/Mage.Sets/src/mage/cards/s/SultaiFlayer.java index 340936b81a1..65bd68784f1 100644 --- a/Mage.Sets/src/mage/cards/s/SultaiFlayer.java +++ b/Mage.Sets/src/mage/cards/s/SultaiFlayer.java @@ -13,7 +13,6 @@ import mage.constants.ComparisonType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ToughnessPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class SultaiFlayer extends CardImpl { static { filter.add(new ToughnessPredicate(ComparisonType.MORE_THAN, 3)); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public SultaiFlayer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SwiftKick.java b/Mage.Sets/src/mage/cards/s/SwiftKick.java index 0ebb1cdec2b..11ddf07a3e1 100644 --- a/Mage.Sets/src/mage/cards/s/SwiftKick.java +++ b/Mage.Sets/src/mage/cards/s/SwiftKick.java @@ -25,7 +25,7 @@ public final class SwiftKick extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public SwiftKick(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SwiftWarden.java b/Mage.Sets/src/mage/cards/s/SwiftWarden.java index f699d0bf893..203f63e249a 100644 --- a/Mage.Sets/src/mage/cards/s/SwiftWarden.java +++ b/Mage.Sets/src/mage/cards/s/SwiftWarden.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; /** @@ -27,7 +26,7 @@ public final class SwiftWarden extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Merfolk you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.MERFOLK.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/s/SynodSanctum.java b/Mage.Sets/src/mage/cards/s/SynodSanctum.java index 1b4e46689c6..9c0b37b36c2 100644 --- a/Mage.Sets/src/mage/cards/s/SynodSanctum.java +++ b/Mage.Sets/src/mage/cards/s/SynodSanctum.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.permanent.ControllerPredicate; import mage.game.ExileZone; import mage.game.Game; import mage.game.permanent.Permanent; @@ -34,7 +33,7 @@ public final class SynodSanctum extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("permanent you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public SynodSanctum(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TacticalAdvantage.java b/Mage.Sets/src/mage/cards/t/TacticalAdvantage.java index c9605157dbb..a379c96ff56 100644 --- a/Mage.Sets/src/mage/cards/t/TacticalAdvantage.java +++ b/Mage.Sets/src/mage/cards/t/TacticalAdvantage.java @@ -10,7 +10,6 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.BlockedPredicate; import mage.filter.predicate.permanent.BlockingPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -29,7 +28,7 @@ public final class TacticalAdvantage extends CardImpl { BlockedPredicate.instance )); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public TacticalAdvantage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TailSlash.java b/Mage.Sets/src/mage/cards/t/TailSlash.java index 2cd212a4bac..de600570558 100644 --- a/Mage.Sets/src/mage/cards/t/TailSlash.java +++ b/Mage.Sets/src/mage/cards/t/TailSlash.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -21,7 +20,7 @@ public final class TailSlash extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public TailSlash(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TajuruArcher.java b/Mage.Sets/src/mage/cards/t/TajuruArcher.java index ac4fc7ec5ea..9bdd61e5482 100644 --- a/Mage.Sets/src/mage/cards/t/TajuruArcher.java +++ b/Mage.Sets/src/mage/cards/t/TajuruArcher.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -29,7 +28,7 @@ public final class TajuruArcher extends CardImpl { static { filter.add(SubType.ALLY.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filterTarget.add(new AbilityPredicate(FlyingAbility.class)); } diff --git a/Mage.Sets/src/mage/cards/t/TawnosUrzasApprentice.java b/Mage.Sets/src/mage/cards/t/TawnosUrzasApprentice.java index 7d3c450c2b1..b611226f186 100644 --- a/Mage.Sets/src/mage/cards/t/TawnosUrzasApprentice.java +++ b/Mage.Sets/src/mage/cards/t/TawnosUrzasApprentice.java @@ -18,7 +18,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterStackObject; import mage.filter.predicate.ability.ArtifactSourcePredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.stack.StackAbility; @@ -35,7 +34,7 @@ public final class TawnosUrzasApprentice extends CardImpl { static { filter.add(new ArtifactSourcePredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public TawnosUrzasApprentice(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/Teleportal.java b/Mage.Sets/src/mage/cards/t/Teleportal.java index 2bb5cefa96a..572a30e18bb 100644 --- a/Mage.Sets/src/mage/cards/t/Teleportal.java +++ b/Mage.Sets/src/mage/cards/t/Teleportal.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -31,7 +30,7 @@ public final class Teleportal extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public Teleportal(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TemurCharm.java b/Mage.Sets/src/mage/cards/t/TemurCharm.java index eed374f43de..5f5744beab4 100644 --- a/Mage.Sets/src/mage/cards/t/TemurCharm.java +++ b/Mage.Sets/src/mage/cards/t/TemurCharm.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.TargetSpell; import mage.target.common.TargetControlledCreaturePermanent; @@ -33,7 +32,7 @@ public final class TemurCharm extends CardImpl { private static final FilterCreaturePermanent filterCantBlock = new FilterCreaturePermanent("Creatures with power 3 or less"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); filterCantBlock.add(new PowerPredicate(ComparisonType.FEWER_THAN, 4)); } diff --git a/Mage.Sets/src/mage/cards/t/TemurWarShaman.java b/Mage.Sets/src/mage/cards/t/TemurWarShaman.java index 96577ada39b..5e3e4371da9 100644 --- a/Mage.Sets/src/mage/cards/t/TemurWarShaman.java +++ b/Mage.Sets/src/mage/cards/t/TemurWarShaman.java @@ -17,7 +17,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -31,7 +30,7 @@ public final class TemurWarShaman extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public TemurWarShaman(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TendershootDryad.java b/Mage.Sets/src/mage/cards/t/TendershootDryad.java index f0b2929c2c8..74971ce03e9 100644 --- a/Mage.Sets/src/mage/cards/t/TendershootDryad.java +++ b/Mage.Sets/src/mage/cards/t/TendershootDryad.java @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.SaprolingToken; import java.util.UUID; @@ -27,7 +26,7 @@ public final class TendershootDryad extends CardImpl { static { filter.add(SubType.SAPROLING.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public TendershootDryad(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TerritorialHammerskull.java b/Mage.Sets/src/mage/cards/t/TerritorialHammerskull.java index f92b874eff3..5dc1868c988 100644 --- a/Mage.Sets/src/mage/cards/t/TerritorialHammerskull.java +++ b/Mage.Sets/src/mage/cards/t/TerritorialHammerskull.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class TerritorialHammerskull extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public TerritorialHammerskull(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TerrorOfKruinPass.java b/Mage.Sets/src/mage/cards/t/TerrorOfKruinPass.java index e8bad439941..012587cfbb5 100644 --- a/Mage.Sets/src/mage/cards/t/TerrorOfKruinPass.java +++ b/Mage.Sets/src/mage/cards/t/TerrorOfKruinPass.java @@ -20,7 +20,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -31,7 +30,7 @@ public final class TerrorOfKruinPass extends CardImpl { private static final String ruleText = "Werewolves you control have menace. (They can't be blocked except by two or more creatures.)"; private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Werewolf you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.WEREWOLF.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/t/TetzimocPrimalDeath.java b/Mage.Sets/src/mage/cards/t/TetzimocPrimalDeath.java index 78f2da7b666..b6e6fd91335 100644 --- a/Mage.Sets/src/mage/cards/t/TetzimocPrimalDeath.java +++ b/Mage.Sets/src/mage/cards/t/TetzimocPrimalDeath.java @@ -21,7 +21,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; import mage.target.common.TargetCreaturePermanent; @@ -34,7 +33,7 @@ public final class TetzimocPrimalDeath extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature your opponents control with a prey counter on it"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filter.add(new CounterPredicate(CounterType.PREY)); } diff --git a/Mage.Sets/src/mage/cards/t/TeysaOrzhovScion.java b/Mage.Sets/src/mage/cards/t/TeysaOrzhovScion.java index 4a880fc119b..16a82f9d075 100644 --- a/Mage.Sets/src/mage/cards/t/TeysaOrzhovScion.java +++ b/Mage.Sets/src/mage/cards/t/TeysaOrzhovScion.java @@ -21,7 +21,6 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.SpiritWhiteToken; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -38,7 +37,7 @@ public final class TeysaOrzhovScion extends CardImpl { filterWhite.add(new ColorPredicate(ObjectColor.WHITE)); filterBlack.add(new ColorPredicate(ObjectColor.BLACK)); filterBlack.add(AnotherPredicate.instance); - filterBlack.add(new ControllerPredicate(TargetController.YOU)); + filterBlack.add(TargetController.YOU.getControllerPredicate()); } public TeysaOrzhovScion(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TheTriumphOfAnax.java b/Mage.Sets/src/mage/cards/t/TheTriumphOfAnax.java index 922049eedaf..a57f86a49c6 100644 --- a/Mage.Sets/src/mage/cards/t/TheTriumphOfAnax.java +++ b/Mage.Sets/src/mage/cards/t/TheTriumphOfAnax.java @@ -15,7 +15,6 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.Targets; import mage.target.common.TargetControlledCreaturePermanent; @@ -32,7 +31,7 @@ public final class TheTriumphOfAnax extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public TheTriumphOfAnax(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/ThopterArrest.java b/Mage.Sets/src/mage/cards/t/ThopterArrest.java index c3464b02efd..0fdd9ed50c1 100644 --- a/Mage.Sets/src/mage/cards/t/ThopterArrest.java +++ b/Mage.Sets/src/mage/cards/t/ThopterArrest.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; /** @@ -29,7 +28,7 @@ public final class ThopterArrest extends CardImpl { CardType.ARTIFACT.getPredicate(), CardType.CREATURE.getPredicate() )); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ThopterArrest(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/ThornMammoth.java b/Mage.Sets/src/mage/cards/t/ThornMammoth.java index 82b9fca0b1b..a361fa3a296 100644 --- a/Mage.Sets/src/mage/cards/t/ThornMammoth.java +++ b/Mage.Sets/src/mage/cards/t/ThornMammoth.java @@ -13,7 +13,6 @@ import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import java.util.UUID; @@ -26,7 +25,7 @@ public final class ThornMammoth extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public ThornMammoth(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/Thoughtleech.java b/Mage.Sets/src/mage/cards/t/Thoughtleech.java index c5b4c567f6c..002b6d5bd82 100644 --- a/Mage.Sets/src/mage/cards/t/Thoughtleech.java +++ b/Mage.Sets/src/mage/cards/t/Thoughtleech.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -23,7 +22,7 @@ public final class Thoughtleech extends CardImpl { static { filter.add(SubType.ISLAND.getPredicate()); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public Thoughtleech(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/ThrashThreat.java b/Mage.Sets/src/mage/cards/t/ThrashThreat.java index 1c23dbe0f2c..301788e9d7f 100644 --- a/Mage.Sets/src/mage/cards/t/ThrashThreat.java +++ b/Mage.Sets/src/mage/cards/t/ThrashThreat.java @@ -9,7 +9,6 @@ import mage.constants.SpellAbilityType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.RedGreenBeastToken; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -25,7 +24,7 @@ public final class ThrashThreat extends SplitCard { = new FilterCreatureOrPlaneswalkerPermanent("creature or planeswalker you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public ThrashThreat(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/ThundercloudShaman.java b/Mage.Sets/src/mage/cards/t/ThundercloudShaman.java index 4baf9f4a585..9ed9c0f8dcd 100644 --- a/Mage.Sets/src/mage/cards/t/ThundercloudShaman.java +++ b/Mage.Sets/src/mage/cards/t/ThundercloudShaman.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class ThundercloudShaman extends CardImpl { private static final FilterCreaturePermanent filterGiants = new FilterCreaturePermanent("equal to the number of Giants you control"); private static final FilterCreaturePermanent filterNonGiants = new FilterCreaturePermanent("non-Giant creature"); static { - filterGiants.add(new ControllerPredicate(TargetController.YOU)); + filterGiants.add(TargetController.YOU.getControllerPredicate()); filterGiants.add(SubType.GIANT.getPredicate()); filterNonGiants.add(Predicates.not(SubType.GIANT.getPredicate())); } diff --git a/Mage.Sets/src/mage/cards/t/ThundermawHellkite.java b/Mage.Sets/src/mage/cards/t/ThundermawHellkite.java index 24fdde1e704..9664c1a2984 100644 --- a/Mage.Sets/src/mage/cards/t/ThundermawHellkite.java +++ b/Mage.Sets/src/mage/cards/t/ThundermawHellkite.java @@ -17,7 +17,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -31,7 +30,7 @@ public final class ThundermawHellkite extends CardImpl { static { filter.add(new AbilityPredicate(FlyingAbility.class)); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ThundermawHellkite(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TidebinderMage.java b/Mage.Sets/src/mage/cards/t/TidebinderMage.java index b7bf7262d8e..fd43556096a 100644 --- a/Mage.Sets/src/mage/cards/t/TidebinderMage.java +++ b/Mage.Sets/src/mage/cards/t/TidebinderMage.java @@ -21,7 +21,6 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -38,7 +37,7 @@ public final class TidebinderMage extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("red or green creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filter.add(Predicates.or(new ColorPredicate(ObjectColor.RED), new ColorPredicate(ObjectColor.GREEN))); } diff --git a/Mage.Sets/src/mage/cards/t/TimbermawLarva.java b/Mage.Sets/src/mage/cards/t/TimbermawLarva.java index e3d5618f175..1ae05bbd147 100644 --- a/Mage.Sets/src/mage/cards/t/TimbermawLarva.java +++ b/Mage.Sets/src/mage/cards/t/TimbermawLarva.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class TimbermawLarva extends CardImpl { static { filter.add(SubType.FOREST.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } diff --git a/Mage.Sets/src/mage/cards/t/TimberpackWolf.java b/Mage.Sets/src/mage/cards/t/TimberpackWolf.java index 7ad215889f0..b32943ff60d 100644 --- a/Mage.Sets/src/mage/cards/t/TimberpackWolf.java +++ b/Mage.Sets/src/mage/cards/t/TimberpackWolf.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -25,7 +24,7 @@ public final class TimberpackWolf extends CardImpl { static { filter.add(new NamePredicate("Timberpack Wolf")); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public TimberpackWolf(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TimeOfHeroes.java b/Mage.Sets/src/mage/cards/t/TimeOfHeroes.java index a6bab0bd243..0ffb444eee8 100644 --- a/Mage.Sets/src/mage/cards/t/TimeOfHeroes.java +++ b/Mage.Sets/src/mage/cards/t/TimeOfHeroes.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; /** @@ -22,7 +21,7 @@ public final class TimeOfHeroes extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Each creature you control with a level counter"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(new CounterPredicate(CounterType.LEVEL)); } diff --git a/Mage.Sets/src/mage/cards/t/TimeToFeed.java b/Mage.Sets/src/mage/cards/t/TimeToFeed.java index 71c71441f21..9d5fc8bc159 100644 --- a/Mage.Sets/src/mage/cards/t/TimeToFeed.java +++ b/Mage.Sets/src/mage/cards/t/TimeToFeed.java @@ -18,7 +18,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -43,7 +42,7 @@ public final class TimeToFeed extends CardImpl { private static final FilterCreaturePermanent filter1 = new FilterCreaturePermanent("creature an opponent controls"); static { - filter1.add(new ControllerPredicate(TargetController.OPPONENT)); + filter1.add(TargetController.OPPONENT.getControllerPredicate()); } public TimeToFeed(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TitaniaProtectorOfArgoth.java b/Mage.Sets/src/mage/cards/t/TitaniaProtectorOfArgoth.java index 2b732adc5e3..5c4a0d1738c 100644 --- a/Mage.Sets/src/mage/cards/t/TitaniaProtectorOfArgoth.java +++ b/Mage.Sets/src/mage/cards/t/TitaniaProtectorOfArgoth.java @@ -16,7 +16,6 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterLandCard; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.TitaniaProtectorOfArgothElementalToken; import mage.target.common.TargetCardInYourGraveyard; @@ -29,7 +28,7 @@ public final class TitaniaProtectorOfArgoth extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("a land you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public TitaniaProtectorOfArgoth(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TitanicBrawl.java b/Mage.Sets/src/mage/cards/t/TitanicBrawl.java index 4a5aaf85cd4..b06d0c1a7dd 100644 --- a/Mage.Sets/src/mage/cards/t/TitanicBrawl.java +++ b/Mage.Sets/src/mage/cards/t/TitanicBrawl.java @@ -14,7 +14,6 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -32,7 +31,7 @@ public final class TitanicBrawl extends CardImpl { = new FilterControlledCreaturePermanent("a creature you control with a +1/+1 counter on it"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); filter2.add(new CounterPredicate(CounterType.P1P1)); } diff --git a/Mage.Sets/src/mage/cards/t/ToilToRenown.java b/Mage.Sets/src/mage/cards/t/ToilToRenown.java index 584fbfa4317..acb20905677 100644 --- a/Mage.Sets/src/mage/cards/t/ToilToRenown.java +++ b/Mage.Sets/src/mage/cards/t/ToilToRenown.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; /** @@ -27,7 +26,7 @@ public final class ToilToRenown extends CardImpl { CardType.ARTIFACT.getPredicate(), CardType.CREATURE.getPredicate(), CardType.LAND.getPredicate())); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public ToilToRenown(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java b/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java index 1a8485cc43a..35b8c1605cc 100644 --- a/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java +++ b/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.VojaToken; /** @@ -28,9 +27,9 @@ public final class TolsimirWolfblood extends CardImpl { static { filterGreen.add(new ColorPredicate(ObjectColor.GREEN)); - filterGreen.add(new ControllerPredicate(TargetController.YOU)); + filterGreen.add(TargetController.YOU.getControllerPredicate()); filterWhite.add(new ColorPredicate(ObjectColor.WHITE)); - filterWhite.add(new ControllerPredicate(TargetController.YOU)); + filterWhite.add(TargetController.YOU.getControllerPredicate()); } public TolsimirWolfblood(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/ToothCollector.java b/Mage.Sets/src/mage/cards/t/ToothCollector.java index f96313eabb3..aec6b677301 100644 --- a/Mage.Sets/src/mage/cards/t/ToothCollector.java +++ b/Mage.Sets/src/mage/cards/t/ToothCollector.java @@ -19,7 +19,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -34,7 +33,7 @@ public final class ToothCollector extends CardImpl { private static final FilterCreaturePermanent FILTER = new FilterCreaturePermanent("creature an opponent controls"); static { - FILTER.add(new ControllerPredicate(TargetController.OPPONENT)); + FILTER.add(TargetController.OPPONENT.getControllerPredicate()); } public ToothCollector(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/Topplegeist.java b/Mage.Sets/src/mage/cards/t/Topplegeist.java index 4cbff55fb48..8cd57d82e88 100644 --- a/Mage.Sets/src/mage/cards/t/Topplegeist.java +++ b/Mage.Sets/src/mage/cards/t/Topplegeist.java @@ -19,7 +19,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -34,7 +33,7 @@ public final class Topplegeist extends CardImpl { private static final FilterCreaturePermanent FILTER = new FilterCreaturePermanent("creature an opponent controls"); static { - FILTER.add(new ControllerPredicate(TargetController.OPPONENT)); + FILTER.add(TargetController.OPPONENT.getControllerPredicate()); } public Topplegeist(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/ToshiroUmezawa.java b/Mage.Sets/src/mage/cards/t/ToshiroUmezawa.java index 2c19a35e2b7..6b9c5c85826 100644 --- a/Mage.Sets/src/mage/cards/t/ToshiroUmezawa.java +++ b/Mage.Sets/src/mage/cards/t/ToshiroUmezawa.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -35,7 +34,7 @@ public final class ToshiroUmezawa extends CardImpl { private static final FilterCard filterInstant = new FilterCard("instant card from your graveyard"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); filterInstant.add(CardType.INSTANT.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/t/Touchstone.java b/Mage.Sets/src/mage/cards/t/Touchstone.java index 7b09cf5245d..960b3d07e13 100644 --- a/Mage.Sets/src/mage/cards/t/Touchstone.java +++ b/Mage.Sets/src/mage/cards/t/Touchstone.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetArtifactPermanent; /** @@ -24,7 +23,7 @@ public final class Touchstone extends CardImpl { private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("artifact you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public Touchstone(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TourachsGate.java b/Mage.Sets/src/mage/cards/t/TourachsGate.java index 8d15cabff44..9964344acff 100644 --- a/Mage.Sets/src/mage/cards/t/TourachsGate.java +++ b/Mage.Sets/src/mage/cards/t/TourachsGate.java @@ -30,7 +30,6 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.AttackingPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -57,7 +56,7 @@ public final class TourachsGate extends CardImpl { private static final FilterCreaturePermanent filterAttackingCreatures = new FilterCreaturePermanent("attacking creatures you control"); static { filterAttackingCreatures.add(AttackingPredicate.instance); - filterAttackingCreatures.add(new ControllerPredicate(TargetController.YOU)); + filterAttackingCreatures.add(TargetController.YOU.getControllerPredicate()); } private static final FilterControlledCreaturePermanent filterThrull = new FilterControlledCreaturePermanent("a Thrull"); diff --git a/Mage.Sets/src/mage/cards/t/TrapjawTyrant.java b/Mage.Sets/src/mage/cards/t/TrapjawTyrant.java index f79aac5b6d2..77376647dd3 100644 --- a/Mage.Sets/src/mage/cards/t/TrapjawTyrant.java +++ b/Mage.Sets/src/mage/cards/t/TrapjawTyrant.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -26,7 +25,7 @@ public final class TrapjawTyrant extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public TrapjawTyrant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TraverseTheOutlands.java b/Mage.Sets/src/mage/cards/t/TraverseTheOutlands.java index bf4c0b41ea9..2e541f501f8 100644 --- a/Mage.Sets/src/mage/cards/t/TraverseTheOutlands.java +++ b/Mage.Sets/src/mage/cards/t/TraverseTheOutlands.java @@ -14,7 +14,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -66,7 +65,7 @@ class TraverseTheOutlandsEffect extends OneShotEffect { return false; } FilterLandPermanent filter = new FilterLandPermanent(); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); List creatures = game.getBattlefield().getAllActivePermanents(StaticFilters.FILTER_PERMANENT_CREATURE, controller.getId(), game); int amount = 0; diff --git a/Mage.Sets/src/mage/cards/t/TriangleOfWar.java b/Mage.Sets/src/mage/cards/t/TriangleOfWar.java index 44c3186368e..4261d8de5c5 100644 --- a/Mage.Sets/src/mage/cards/t/TriangleOfWar.java +++ b/Mage.Sets/src/mage/cards/t/TriangleOfWar.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -26,7 +25,7 @@ public final class TriangleOfWar extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public TriangleOfWar(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TuskguardCaptain.java b/Mage.Sets/src/mage/cards/t/TuskguardCaptain.java index a226f4a9770..44036e1cc74 100644 --- a/Mage.Sets/src/mage/cards/t/TuskguardCaptain.java +++ b/Mage.Sets/src/mage/cards/t/TuskguardCaptain.java @@ -17,7 +17,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; /** @@ -30,7 +29,7 @@ public final class TuskguardCaptain extends CardImpl { static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(new CounterPredicate(CounterType.P1P1)); } diff --git a/Mage.Sets/src/mage/cards/t/TuvasaTheSunlit.java b/Mage.Sets/src/mage/cards/t/TuvasaTheSunlit.java index 1dd9cbae18d..d0536977fc6 100644 --- a/Mage.Sets/src/mage/cards/t/TuvasaTheSunlit.java +++ b/Mage.Sets/src/mage/cards/t/TuvasaTheSunlit.java @@ -23,7 +23,6 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.FilterSpell; import mage.filter.common.FilterEnchantmentPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.Spell; @@ -47,7 +46,7 @@ public final class TuvasaTheSunlit extends CardImpl { // Tuvasa the Sunlit gets +1/+1 for each enchantment you control. FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent("enchantment you control"); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); DynamicValue value = new PermanentsOnBattlefieldCount(new FilterPermanent(filter)); Ability ability = new SimpleStaticAbility( diff --git a/Mage.Sets/src/mage/cards/t/TwistedJustice.java b/Mage.Sets/src/mage/cards/t/TwistedJustice.java index f757a13db9e..3fa21371eea 100644 --- a/Mage.Sets/src/mage/cards/t/TwistedJustice.java +++ b/Mage.Sets/src/mage/cards/t/TwistedJustice.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -59,7 +58,7 @@ class TwistedJusticeEffect extends OneShotEffect { FilterControlledPermanent filter = new FilterControlledPermanent("creature"); filter.add(CardType.CREATURE.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); TargetControlledPermanent target = new TargetControlledPermanent(1, 1, filter, true); //A spell or ability could have removed the only legal target this player diff --git a/Mage.Sets/src/mage/cards/u/UbulSarGatekeepers.java b/Mage.Sets/src/mage/cards/u/UbulSarGatekeepers.java index fb063604861..6122c56bbe1 100644 --- a/Mage.Sets/src/mage/cards/u/UbulSarGatekeepers.java +++ b/Mage.Sets/src/mage/cards/u/UbulSarGatekeepers.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; @@ -29,7 +28,7 @@ public final class UbulSarGatekeepers extends CardImpl { static { filter.add(SubType.GATE.getPredicate()); - targetFilter.add(new ControllerPredicate(TargetController.OPPONENT)); + targetFilter.add(TargetController.OPPONENT.getControllerPredicate()); } private static final Condition gatesCondition = new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 1); diff --git a/Mage.Sets/src/mage/cards/u/UlrichUncontestedAlpha.java b/Mage.Sets/src/mage/cards/u/UlrichUncontestedAlpha.java index efd42b28a49..8a65059dc2e 100644 --- a/Mage.Sets/src/mage/cards/u/UlrichUncontestedAlpha.java +++ b/Mage.Sets/src/mage/cards/u/UlrichUncontestedAlpha.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -66,7 +65,7 @@ class UlrichUncontestedAlphaAbility extends TriggeredAbilityImpl { static { filter.add(Predicates.not(SubType.WEREWOLF.getPredicate())); - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public UlrichUncontestedAlphaAbility() { diff --git a/Mage.Sets/src/mage/cards/u/UlvenwaldMysteries.java b/Mage.Sets/src/mage/cards/u/UlvenwaldMysteries.java index ec443f794ad..538e66c96f0 100644 --- a/Mage.Sets/src/mage/cards/u/UlvenwaldMysteries.java +++ b/Mage.Sets/src/mage/cards/u/UlvenwaldMysteries.java @@ -15,7 +15,6 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -32,7 +31,7 @@ public final class UlvenwaldMysteries extends CardImpl { private static final FilterControlledPermanent filterClue = new FilterControlledPermanent("a Clue"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.not(TokenPredicate.instance)); filterClue.add(SubType.CLUE.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/u/UlvenwaldObserver.java b/Mage.Sets/src/mage/cards/u/UlvenwaldObserver.java index b265a28bd6f..f99a887998c 100644 --- a/Mage.Sets/src/mage/cards/u/UlvenwaldObserver.java +++ b/Mage.Sets/src/mage/cards/u/UlvenwaldObserver.java @@ -13,7 +13,6 @@ import mage.constants.ComparisonType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ToughnessPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class UlvenwaldObserver extends CardImpl { static { filter.add(new ToughnessPredicate(ComparisonType.MORE_THAN, 3)); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public UlvenwaldObserver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UndeadAugur.java b/Mage.Sets/src/mage/cards/u/UndeadAugur.java index 7c4e162c18d..15541420083 100644 --- a/Mage.Sets/src/mage/cards/u/UndeadAugur.java +++ b/Mage.Sets/src/mage/cards/u/UndeadAugur.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -24,7 +23,7 @@ public final class UndeadAugur extends CardImpl { = new FilterCreaturePermanent(SubType.ZOMBIE, "Zombie you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public UndeadAugur(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UndercityUprising.java b/Mage.Sets/src/mage/cards/u/UndercityUprising.java index da820f372b8..c24d0304fbc 100644 --- a/Mage.Sets/src/mage/cards/u/UndercityUprising.java +++ b/Mage.Sets/src/mage/cards/u/UndercityUprising.java @@ -11,7 +11,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -25,7 +24,7 @@ public final class UndercityUprising extends CardImpl { = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public UndercityUprising(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UnnaturalAggression.java b/Mage.Sets/src/mage/cards/u/UnnaturalAggression.java index 4698854dc93..30f9e2ef03b 100644 --- a/Mage.Sets/src/mage/cards/u/UnnaturalAggression.java +++ b/Mage.Sets/src/mage/cards/u/UnnaturalAggression.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.SecondTargetPointer; @@ -25,7 +24,7 @@ public final class UnnaturalAggression extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public UnnaturalAggression(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UnnervingAssault.java b/Mage.Sets/src/mage/cards/u/UnnervingAssault.java index d3ab5d6af2b..2eb880ef379 100644 --- a/Mage.Sets/src/mage/cards/u/UnnervingAssault.java +++ b/Mage.Sets/src/mage/cards/u/UnnervingAssault.java @@ -13,7 +13,6 @@ import mage.constants.ColoredManaSymbol; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.watchers.common.ManaSpentToCastWatcher; /** @@ -27,8 +26,8 @@ public final class UnnervingAssault extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); - filter2.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); + filter2.add(TargetController.YOU.getControllerPredicate()); } public UnnervingAssault(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UnrulyMob.java b/Mage.Sets/src/mage/cards/u/UnrulyMob.java index 7777945b626..58732d9d88b 100644 --- a/Mage.Sets/src/mage/cards/u/UnrulyMob.java +++ b/Mage.Sets/src/mage/cards/u/UnrulyMob.java @@ -13,7 +13,6 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -25,7 +24,7 @@ public final class UnrulyMob extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public UnrulyMob(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UnstoppableAsh.java b/Mage.Sets/src/mage/cards/u/UnstoppableAsh.java index 791a81e9be2..33c785c3d37 100644 --- a/Mage.Sets/src/mage/cards/u/UnstoppableAsh.java +++ b/Mage.Sets/src/mage/cards/u/UnstoppableAsh.java @@ -16,7 +16,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -28,7 +27,7 @@ public final class UnstoppableAsh extends CardImpl { static final private FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public UnstoppableAsh(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UrborgStalker.java b/Mage.Sets/src/mage/cards/u/UrborgStalker.java index 3cedae59d57..681fc6bac7e 100644 --- a/Mage.Sets/src/mage/cards/u/UrborgStalker.java +++ b/Mage.Sets/src/mage/cards/u/UrborgStalker.java @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -27,7 +26,7 @@ public final class UrborgStalker extends CardImpl { private static final FilterPermanent filter = new FilterPermanent(); static { - filter.add(new ControllerPredicate(TargetController.ACTIVE)); + filter.add(TargetController.ACTIVE.getControllerPredicate()); filter.add(Predicates.not(new ColorPredicate(ObjectColor.BLACK))); filter.add(Predicates.not(CardType.LAND.getPredicate())); } diff --git a/Mage.Sets/src/mage/cards/u/UrgeToFeed.java b/Mage.Sets/src/mage/cards/u/UrgeToFeed.java index 3f1a4611a71..ac769666238 100644 --- a/Mage.Sets/src/mage/cards/u/UrgeToFeed.java +++ b/Mage.Sets/src/mage/cards/u/UrgeToFeed.java @@ -11,7 +11,6 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -48,7 +47,7 @@ class UrgeToFeedEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped Vampire creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); filter.add(SubType.VAMPIRE.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/u/UrzaAcademyHeadmaster.java b/Mage.Sets/src/mage/cards/u/UrzaAcademyHeadmaster.java index fca38d81290..7119d1df9f5 100644 --- a/Mage.Sets/src/mage/cards/u/UrzaAcademyHeadmaster.java +++ b/Mage.Sets/src/mage/cards/u/UrzaAcademyHeadmaster.java @@ -33,7 +33,6 @@ import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.*; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.command.emblems.*; import mage.game.permanent.token.*; @@ -89,7 +88,7 @@ class UrzaAcademyHeadmasterRandomEffect extends OneShotEffect { private static final FilterPermanent filter4 = new FilterPermanent("creatures and/or planeswalkers"); static { - filter1.add(new ControllerPredicate(TargetController.YOU)); + filter1.add(TargetController.YOU.getControllerPredicate()); filter2.add(Predicates.not(CardType.CREATURE.getPredicate())); filter3.add(Predicates.or( CardType.CREATURE.getPredicate(), diff --git a/Mage.Sets/src/mage/cards/v/ValakutTheMoltenPinnacle.java b/Mage.Sets/src/mage/cards/v/ValakutTheMoltenPinnacle.java index f566789ae2c..a124785b3b3 100644 --- a/Mage.Sets/src/mage/cards/v/ValakutTheMoltenPinnacle.java +++ b/Mage.Sets/src/mage/cards/v/ValakutTheMoltenPinnacle.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -29,7 +28,7 @@ public final class ValakutTheMoltenPinnacle extends CardImpl { static final FilterLandPermanent filter = new FilterLandPermanent("Mountain"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.MOUNTAIN.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/v/VampiricFury.java b/Mage.Sets/src/mage/cards/v/VampiricFury.java index 3a2dc63523d..011a1460db9 100644 --- a/Mage.Sets/src/mage/cards/v/VampiricFury.java +++ b/Mage.Sets/src/mage/cards/v/VampiricFury.java @@ -12,7 +12,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @author nantuko @@ -23,7 +22,7 @@ public final class VampiricFury extends CardImpl { static { vampires.add(SubType.VAMPIRE.getPredicate()); - vampires.add(new ControllerPredicate(TargetController.YOU)); + vampires.add(TargetController.YOU.getControllerPredicate()); } public VampiricFury(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/Vandalblast.java b/Mage.Sets/src/mage/cards/v/Vandalblast.java index af2848e71bb..e9e2a86d165 100644 --- a/Mage.Sets/src/mage/cards/v/Vandalblast.java +++ b/Mage.Sets/src/mage/cards/v/Vandalblast.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetArtifactPermanent; import java.util.UUID; @@ -22,7 +21,7 @@ public final class Vandalblast extends CardImpl { private static final FilterArtifactPermanent FILTER = new FilterArtifactPermanent("artifact you don't control"); static { - FILTER.add(new ControllerPredicate(TargetController.NOT_YOU)); + FILTER.add(TargetController.NOT_YOU.getControllerPredicate()); } public Vandalblast(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VanquishersBanner.java b/Mage.Sets/src/mage/cards/v/VanquishersBanner.java index 9c935e622c7..ac3650e2d5d 100644 --- a/Mage.Sets/src/mage/cards/v/VanquishersBanner.java +++ b/Mage.Sets/src/mage/cards/v/VanquishersBanner.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -32,7 +31,7 @@ public final class VanquishersBanner extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control of the chosen type"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public VanquishersBanner(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VarchildBetrayerOfKjeldor.java b/Mage.Sets/src/mage/cards/v/VarchildBetrayerOfKjeldor.java index 242d6a59897..f3715cd4eb7 100644 --- a/Mage.Sets/src/mage/cards/v/VarchildBetrayerOfKjeldor.java +++ b/Mage.Sets/src/mage/cards/v/VarchildBetrayerOfKjeldor.java @@ -22,7 +22,6 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.token.SurvivorToken; @@ -39,7 +38,7 @@ public final class VarchildBetrayerOfKjeldor extends CardImpl { ); static { - filter1.add(new ControllerPredicate(TargetController.OPPONENT)); + filter1.add(TargetController.OPPONENT.getControllerPredicate()); } public VarchildBetrayerOfKjeldor(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VastwoodHydra.java b/Mage.Sets/src/mage/cards/v/VastwoodHydra.java index 731783ab277..0aaed1b5521 100644 --- a/Mage.Sets/src/mage/cards/v/VastwoodHydra.java +++ b/Mage.Sets/src/mage/cards/v/VastwoodHydra.java @@ -17,7 +17,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.Target; @@ -32,7 +31,7 @@ public final class VastwoodHydra extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public VastwoodHydra(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VedalkenPlotter.java b/Mage.Sets/src/mage/cards/v/VedalkenPlotter.java index f6b03606591..3d7d49a259f 100644 --- a/Mage.Sets/src/mage/cards/v/VedalkenPlotter.java +++ b/Mage.Sets/src/mage/cards/v/VedalkenPlotter.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; @@ -30,7 +29,7 @@ public final class VedalkenPlotter extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("land an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public VedalkenPlotter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VelaTheNightClad.java b/Mage.Sets/src/mage/cards/v/VelaTheNightClad.java index 8e9015bf3fc..7d9635f9351 100644 --- a/Mage.Sets/src/mage/cards/v/VelaTheNightClad.java +++ b/Mage.Sets/src/mage/cards/v/VelaTheNightClad.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -26,7 +25,7 @@ public final class VelaTheNightClad extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public VelaTheNightClad(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VerdurousGearhulk.java b/Mage.Sets/src/mage/cards/v/VerdurousGearhulk.java index d60664c6dc3..dfebad48af2 100644 --- a/Mage.Sets/src/mage/cards/v/VerdurousGearhulk.java +++ b/Mage.Sets/src/mage/cards/v/VerdurousGearhulk.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanentAmount; /** @@ -26,7 +25,7 @@ public final class VerdurousGearhulk extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public VerdurousGearhulk(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VexingBeetle.java b/Mage.Sets/src/mage/cards/v/VexingBeetle.java index bc98251a64d..2d0b03297d6 100644 --- a/Mage.Sets/src/mage/cards/v/VexingBeetle.java +++ b/Mage.Sets/src/mage/cards/v/VexingBeetle.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -28,7 +27,7 @@ public final class VexingBeetle extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public VexingBeetle(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/ViashinoBey.java b/Mage.Sets/src/mage/cards/v/ViashinoBey.java index d3471e16e40..fe4c657c4f7 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoBey.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoBey.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.permanent.ControllerPredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; @@ -27,7 +26,7 @@ public final class ViashinoBey extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public ViashinoBey(UUID ownerId, CardSetInfo setInfo) { @@ -57,7 +56,7 @@ class ViashinoBeyEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public ViashinoBeyEffect() { diff --git a/Mage.Sets/src/mage/cards/v/VineshaperMystic.java b/Mage.Sets/src/mage/cards/v/VineshaperMystic.java index f598a5fc88e..d05cb35521b 100644 --- a/Mage.Sets/src/mage/cards/v/VineshaperMystic.java +++ b/Mage.Sets/src/mage/cards/v/VineshaperMystic.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; /** @@ -27,7 +26,7 @@ public final class VineshaperMystic extends CardImpl { static { filter.add(SubType.MERFOLK.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public VineshaperMystic(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/ViridianLorebearers.java b/Mage.Sets/src/mage/cards/v/ViridianLorebearers.java index 81e83b57675..8fec9074f9e 100644 --- a/Mage.Sets/src/mage/cards/v/ViridianLorebearers.java +++ b/Mage.Sets/src/mage/cards/v/ViridianLorebearers.java @@ -18,7 +18,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -30,7 +29,7 @@ public final class ViridianLorebearers extends CardImpl { private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("artifacts your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public ViridianLorebearers(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VitalSplicer.java b/Mage.Sets/src/mage/cards/v/VitalSplicer.java index 127f93c2ab9..0011ee7bcb0 100644 --- a/Mage.Sets/src/mage/cards/v/VitalSplicer.java +++ b/Mage.Sets/src/mage/cards/v/VitalSplicer.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.GolemToken; import mage.target.common.TargetCreaturePermanent; @@ -31,7 +30,7 @@ public final class VitalSplicer extends CardImpl { static { filter.add(CardType.CREATURE.getPredicate()); filter.add(SubType.GOLEM.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public VitalSplicer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VivienOfTheArkbow.java b/Mage.Sets/src/mage/cards/v/VivienOfTheArkbow.java index b3068b7a35d..3fd71469cbd 100644 --- a/Mage.Sets/src/mage/cards/v/VivienOfTheArkbow.java +++ b/Mage.Sets/src/mage/cards/v/VivienOfTheArkbow.java @@ -19,7 +19,6 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -32,7 +31,7 @@ public final class VivienOfTheArkbow extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public VivienOfTheArkbow(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VizierOfTheTrue.java b/Mage.Sets/src/mage/cards/v/VizierOfTheTrue.java index 689ef5398dc..a3ad8f87af9 100644 --- a/Mage.Sets/src/mage/cards/v/VizierOfTheTrue.java +++ b/Mage.Sets/src/mage/cards/v/VizierOfTheTrue.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -55,7 +54,7 @@ class VizierOfTheTrueAbility extends TriggeredAbilityImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public VizierOfTheTrueAbility() { diff --git a/Mage.Sets/src/mage/cards/v/VolcanicOffering.java b/Mage.Sets/src/mage/cards/v/VolcanicOffering.java index 96a171f91d2..56efb6faae4 100644 --- a/Mage.Sets/src/mage/cards/v/VolcanicOffering.java +++ b/Mage.Sets/src/mage/cards/v/VolcanicOffering.java @@ -12,7 +12,6 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.ControllerIdPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -52,9 +51,9 @@ enum VolcanicOfferingAdjuster implements TargetAdjuster { private static final FilterCreaturePermanent filterCreature = new FilterCreaturePermanent("creature you don't control"); static { - filterLand.add(new ControllerPredicate(TargetController.NOT_YOU)); + filterLand.add(TargetController.NOT_YOU.getControllerPredicate()); filterLand.add(Predicates.not(SuperType.BASIC.getPredicate())); - filterCreature.add(new ControllerPredicate(TargetController.NOT_YOU)); + filterCreature.add(TargetController.NOT_YOU.getControllerPredicate()); } @Override diff --git a/Mage.Sets/src/mage/cards/v/VolcanicVision.java b/Mage.Sets/src/mage/cards/v/VolcanicVision.java index 432d75c90df..e39bb3ec4fc 100644 --- a/Mage.Sets/src/mage/cards/v/VolcanicVision.java +++ b/Mage.Sets/src/mage/cards/v/VolcanicVision.java @@ -14,7 +14,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterInstantOrSorceryCard; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -50,7 +49,7 @@ class VolcanicVisionReturnToHandTargetEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public VolcanicVisionReturnToHandTargetEffect() { diff --git a/Mage.Sets/src/mage/cards/v/VoraciousHydra.java b/Mage.Sets/src/mage/cards/v/VoraciousHydra.java index d1cfd1d3904..374f5890f2e 100644 --- a/Mage.Sets/src/mage/cards/v/VoraciousHydra.java +++ b/Mage.Sets/src/mage/cards/v/VoraciousHydra.java @@ -18,7 +18,6 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -33,7 +32,7 @@ public final class VoraciousHydra extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public VoraciousHydra(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VraskasFinisher.java b/Mage.Sets/src/mage/cards/v/VraskasFinisher.java index 1019d30af24..dbd0e903167 100644 --- a/Mage.Sets/src/mage/cards/v/VraskasFinisher.java +++ b/Mage.Sets/src/mage/cards/v/VraskasFinisher.java @@ -11,7 +11,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.WasDealtDamageThisTurnPredicate; import mage.target.TargetPermanent; @@ -28,7 +27,7 @@ public final class VraskasFinisher extends CardImpl { static { filter.add(new WasDealtDamageThisTurnPredicate()); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public VraskasFinisher(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WalkerOfTheWastes.java b/Mage.Sets/src/mage/cards/w/WalkerOfTheWastes.java index 972286d722d..6553eeb33ab 100644 --- a/Mage.Sets/src/mage/cards/w/WalkerOfTheWastes.java +++ b/Mage.Sets/src/mage/cards/w/WalkerOfTheWastes.java @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -28,7 +27,7 @@ public final class WalkerOfTheWastes extends CardImpl { static { filter.add(new NamePredicate("Wastes")); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public WalkerOfTheWastes(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WarsToll.java b/Mage.Sets/src/mage/cards/w/WarsToll.java index 03ebff5f7e9..146ba03236d 100644 --- a/Mage.Sets/src/mage/cards/w/WarsToll.java +++ b/Mage.Sets/src/mage/cards/w/WarsToll.java @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -31,8 +30,8 @@ public final class WarsToll extends CardImpl { private static final FilterLandPermanent filterOpponentLand = new FilterLandPermanent("an opponent taps a land"); static { - filterOpponentCreature.add(new ControllerPredicate(TargetController.OPPONENT)); - filterOpponentLand.add(new ControllerPredicate(TargetController.OPPONENT)); + filterOpponentCreature.add(TargetController.OPPONENT.getControllerPredicate()); + filterOpponentLand.add(TargetController.OPPONENT.getControllerPredicate()); } public WarsToll(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WarteyeWitch.java b/Mage.Sets/src/mage/cards/w/WarteyeWitch.java index 4818ce2c2e1..6249cb2d981 100644 --- a/Mage.Sets/src/mage/cards/w/WarteyeWitch.java +++ b/Mage.Sets/src/mage/cards/w/WarteyeWitch.java @@ -9,7 +9,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -22,7 +21,7 @@ public final class WarteyeWitch extends CardImpl { = new FilterCreaturePermanent("creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public WarteyeWitch(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WashOut.java b/Mage.Sets/src/mage/cards/w/WashOut.java index fb68bf33ad9..5c9cf86c26e 100644 --- a/Mage.Sets/src/mage/cards/w/WashOut.java +++ b/Mage.Sets/src/mage/cards/w/WashOut.java @@ -15,7 +15,6 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -29,7 +28,7 @@ public final class WashOut extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public WashOut(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WatertrapWeaver.java b/Mage.Sets/src/mage/cards/w/WatertrapWeaver.java index 5490f747a8b..db79c204a00 100644 --- a/Mage.Sets/src/mage/cards/w/WatertrapWeaver.java +++ b/Mage.Sets/src/mage/cards/w/WatertrapWeaver.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class WatertrapWeaver extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public WatertrapWeaver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WavecrashTriton.java b/Mage.Sets/src/mage/cards/w/WavecrashTriton.java index 6c8fd6afe90..116d8fc37a4 100644 --- a/Mage.Sets/src/mage/cards/w/WavecrashTriton.java +++ b/Mage.Sets/src/mage/cards/w/WavecrashTriton.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class WavecrashTriton extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static{ - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public WavecrashTriton(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WaxingMoon.java b/Mage.Sets/src/mage/cards/w/WaxingMoon.java index 04ca4644414..7b29b8b59df 100644 --- a/Mage.Sets/src/mage/cards/w/WaxingMoon.java +++ b/Mage.Sets/src/mage/cards/w/WaxingMoon.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -27,7 +26,7 @@ public final class WaxingMoon extends CardImpl { static { filter.add(SubType.WEREWOLF.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public WaxingMoon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WaywardDisciple.java b/Mage.Sets/src/mage/cards/w/WaywardDisciple.java index 339bccb29fe..04e89042553 100644 --- a/Mage.Sets/src/mage/cards/w/WaywardDisciple.java +++ b/Mage.Sets/src/mage/cards/w/WaywardDisciple.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetOpponent; /** @@ -26,7 +25,7 @@ public final class WaywardDisciple extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public WaywardDisciple(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WeaponSurge.java b/Mage.Sets/src/mage/cards/w/WeaponSurge.java index 1fb3fa59efe..67928f13b19 100644 --- a/Mage.Sets/src/mage/cards/w/WeaponSurge.java +++ b/Mage.Sets/src/mage/cards/w/WeaponSurge.java @@ -17,7 +17,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -30,7 +29,7 @@ public final class WeaponSurge extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("All creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public WeaponSurge(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WeaverOfLightning.java b/Mage.Sets/src/mage/cards/w/WeaverOfLightning.java index 818e4038535..6d154a78f81 100644 --- a/Mage.Sets/src/mage/cards/w/WeaverOfLightning.java +++ b/Mage.Sets/src/mage/cards/w/WeaverOfLightning.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterInstantOrSorcerySpell; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -26,7 +25,7 @@ public final class WeaverOfLightning extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public WeaverOfLightning(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WickedWolf.java b/Mage.Sets/src/mage/cards/w/WickedWolf.java index 3888da8973c..917d7bd0b09 100644 --- a/Mage.Sets/src/mage/cards/w/WickedWolf.java +++ b/Mage.Sets/src/mage/cards/w/WickedWolf.java @@ -20,7 +20,6 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; @@ -37,7 +36,7 @@ public final class WickedWolf extends CardImpl { = new FilterControlledPermanent(SubType.FOOD, "a Food"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } public WickedWolf(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WildInstincts.java b/Mage.Sets/src/mage/cards/w/WildInstincts.java index 7f9d7272482..7faaebcd6d2 100644 --- a/Mage.Sets/src/mage/cards/w/WildInstincts.java +++ b/Mage.Sets/src/mage/cards/w/WildInstincts.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -24,7 +23,7 @@ public final class WildInstincts extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public WildInstincts(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WildernessElemental.java b/Mage.Sets/src/mage/cards/w/WildernessElemental.java index eb335ed3ab1..286550181cb 100644 --- a/Mage.Sets/src/mage/cards/w/WildernessElemental.java +++ b/Mage.Sets/src/mage/cards/w/WildernessElemental.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -24,7 +23,7 @@ public final class WildernessElemental extends CardImpl { static { filter.add(Predicates.not(SuperType.BASIC.getPredicate())); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public WildernessElemental(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WildfireCerberus.java b/Mage.Sets/src/mage/cards/w/WildfireCerberus.java index 127dec48307..33bedaa6ae9 100644 --- a/Mage.Sets/src/mage/cards/w/WildfireCerberus.java +++ b/Mage.Sets/src/mage/cards/w/WildfireCerberus.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -26,7 +25,7 @@ public final class WildfireCerberus extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public WildfireCerberus(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WiltLeafLiege.java b/Mage.Sets/src/mage/cards/w/WiltLeafLiege.java index 874833d6b65..26aeca5c4d5 100644 --- a/Mage.Sets/src/mage/cards/w/WiltLeafLiege.java +++ b/Mage.Sets/src/mage/cards/w/WiltLeafLiege.java @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -28,9 +27,9 @@ public final class WiltLeafLiege extends CardImpl { private static final FilterCreaturePermanent filterWhite = new FilterCreaturePermanent("white creatures you control"); static { filterGreen.add(new ColorPredicate(ObjectColor.GREEN)); - filterGreen.add(new ControllerPredicate(TargetController.YOU)); + filterGreen.add(TargetController.YOU.getControllerPredicate()); filterWhite.add(new ColorPredicate(ObjectColor.WHITE)); - filterWhite.add(new ControllerPredicate(TargetController.YOU)); + filterWhite.add(TargetController.YOU.getControllerPredicate()); } public WiltLeafLiege(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WindsOfAbandon.java b/Mage.Sets/src/mage/cards/w/WindsOfAbandon.java index d534c3a136a..b3233eb2bee 100644 --- a/Mage.Sets/src/mage/cards/w/WindsOfAbandon.java +++ b/Mage.Sets/src/mage/cards/w/WindsOfAbandon.java @@ -15,7 +15,6 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -106,7 +105,7 @@ class WindsOfAbandonOverloadEffect extends OneShotEffect { static final FilterPermanent filter = new FilterCreaturePermanent("creature you don't control"); static { - filter.add(new ControllerPredicate(TargetController.NOT_YOU)); + filter.add(TargetController.NOT_YOU.getControllerPredicate()); } WindsOfAbandonOverloadEffect() { diff --git a/Mage.Sets/src/mage/cards/w/WindsOfQalSisma.java b/Mage.Sets/src/mage/cards/w/WindsOfQalSisma.java index 715c7de7879..28d0eceaf9a 100644 --- a/Mage.Sets/src/mage/cards/w/WindsOfQalSisma.java +++ b/Mage.Sets/src/mage/cards/w/WindsOfQalSisma.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -24,7 +23,7 @@ public final class WindsOfQalSisma extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public WindsOfQalSisma(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WitchHunter.java b/Mage.Sets/src/mage/cards/w/WitchHunter.java index b64e67e869d..c6a1294bd06 100644 --- a/Mage.Sets/src/mage/cards/w/WitchHunter.java +++ b/Mage.Sets/src/mage/cards/w/WitchHunter.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetPlayerOrPlaneswalker; @@ -29,7 +28,7 @@ public final class WitchHunter extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public WitchHunter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WitheringWisps.java b/Mage.Sets/src/mage/cards/w/WitheringWisps.java index d5577a3c7c4..514f3e23853 100644 --- a/Mage.Sets/src/mage/cards/w/WitheringWisps.java +++ b/Mage.Sets/src/mage/cards/w/WitheringWisps.java @@ -20,7 +20,6 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -58,7 +57,7 @@ class WitheringWispsActivatedAbility extends ActivatedAbilityImpl { static { filter.add(SuperType.SNOW.getPredicate()); filter.add(SubType.SWAMP.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } @Override diff --git a/Mage.Sets/src/mage/cards/w/WoollyMammoths.java b/Mage.Sets/src/mage/cards/w/WoollyMammoths.java index 7669311441c..6b5d5b0801d 100644 --- a/Mage.Sets/src/mage/cards/w/WoollyMammoths.java +++ b/Mage.Sets/src/mage/cards/w/WoollyMammoths.java @@ -17,7 +17,6 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -30,7 +29,7 @@ public final class WoollyMammoths extends CardImpl { static { filter.add(SuperType.SNOW.getPredicate()); filter.add(CardType.LAND.getPredicate()); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public WoollyMammoths(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WorldgorgerDragon.java b/Mage.Sets/src/mage/cards/w/WorldgorgerDragon.java index e3f967b7e36..4f94c36cff0 100644 --- a/Mage.Sets/src/mage/cards/w/WorldgorgerDragon.java +++ b/Mage.Sets/src/mage/cards/w/WorldgorgerDragon.java @@ -22,7 +22,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.ExileZone; import mage.game.Game; import mage.game.permanent.PermanentToken; @@ -69,7 +68,7 @@ class WorldgorgerDragonEntersEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterPermanent("all other permanents you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/w/WrensRunPackmaster.java b/Mage.Sets/src/mage/cards/w/WrensRunPackmaster.java index db4aa91f813..75e9170b885 100644 --- a/Mage.Sets/src/mage/cards/w/WrensRunPackmaster.java +++ b/Mage.Sets/src/mage/cards/w/WrensRunPackmaster.java @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.WolfToken; /** @@ -26,7 +25,7 @@ public final class WrensRunPackmaster extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Wolf"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.WOLF.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/x/XathridNecromancer.java b/Mage.Sets/src/mage/cards/x/XathridNecromancer.java index 7e5abfc0805..fa9074dba85 100644 --- a/Mage.Sets/src/mage/cards/x/XathridNecromancer.java +++ b/Mage.Sets/src/mage/cards/x/XathridNecromancer.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.ZombieToken; /** @@ -25,7 +24,7 @@ public final class XathridNecromancer extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Human creature you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); filter.add(SubType.HUMAN.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/y/YasovaDragonclaw.java b/Mage.Sets/src/mage/cards/y/YasovaDragonclaw.java index 84b8b683e1c..ee25352e030 100644 --- a/Mage.Sets/src/mage/cards/y/YasovaDragonclaw.java +++ b/Mage.Sets/src/mage/cards/y/YasovaDragonclaw.java @@ -23,7 +23,6 @@ import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.ObjectSourcePlayer; import mage.filter.predicate.ObjectSourcePlayerPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -38,7 +37,7 @@ public final class YasovaDragonclaw extends CardImpl { static { filter.add(new YasovaDragonclawPowerLessThanSourcePredicate()); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); } public YasovaDragonclaw(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/y/YurikoTheTigersShadow.java b/Mage.Sets/src/mage/cards/y/YurikoTheTigersShadow.java index bec2707e419..077b940a790 100644 --- a/Mage.Sets/src/mage/cards/y/YurikoTheTigersShadow.java +++ b/Mage.Sets/src/mage/cards/y/YurikoTheTigersShadow.java @@ -20,7 +20,6 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.players.Player; @@ -34,7 +33,7 @@ public final class YurikoTheTigersShadow extends CardImpl { = new FilterCreaturePermanent(SubType.NINJA, "a Ninja you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public YurikoTheTigersShadow(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/z/ZulaportCutthroat.java b/Mage.Sets/src/mage/cards/z/ZulaportCutthroat.java index 3d506d7e8cc..214757f1455 100644 --- a/Mage.Sets/src/mage/cards/z/ZulaportCutthroat.java +++ b/Mage.Sets/src/mage/cards/z/ZulaportCutthroat.java @@ -12,10 +12,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.StaticFilters; -import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * diff --git a/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java index 36f670f80bd..ed49adc4760 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java @@ -7,7 +7,6 @@ import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -35,7 +34,7 @@ public class PopulateEffect extends OneShotEffect { static { filter.add(TokenPredicate.instance); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public PopulateEffect() { diff --git a/Mage/src/main/java/mage/abilities/effects/common/SacrificeOpponentsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SacrificeOpponentsEffect.java index f1d9df7128f..52b840747fd 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SacrificeOpponentsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SacrificeOpponentsEffect.java @@ -10,7 +10,6 @@ import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -39,7 +38,7 @@ public class SacrificeOpponentsEffect extends OneShotEffect { super(Outcome.Sacrifice); this.amount = amount; this.filter = filter.copy(); - this.filter.add(new ControllerPredicate(TargetController.YOU)); + this.filter.add(TargetController.YOU.getControllerPredicate()); setText(); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/SacrificeOpponentsUnlessPayEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SacrificeOpponentsUnlessPayEffect.java index f37daeadb06..f3e764b4437 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SacrificeOpponentsUnlessPayEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SacrificeOpponentsUnlessPayEffect.java @@ -10,7 +10,6 @@ import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -99,7 +98,7 @@ public class SacrificeOpponentsUnlessPayEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { List permsToSacrifice = new ArrayList<>(); - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); for (UUID playerId : game.getOpponents(source.getControllerId())) { Player player = game.getPlayer(playerId); diff --git a/Mage/src/main/java/mage/abilities/keyword/BountyAbility.java b/Mage/src/main/java/mage/abilities/keyword/BountyAbility.java index 0879c6608b6..38dda22c8d2 100644 --- a/Mage/src/main/java/mage/abilities/keyword/BountyAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/BountyAbility.java @@ -10,7 +10,6 @@ import mage.abilities.effects.Effect; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; /** @@ -22,7 +21,7 @@ public class BountyAbility extends DiesCreatureTriggeredAbility { private static final FilterCreaturePermanent bountyCounterFilter = new FilterCreaturePermanent("creature an opponent controls with a bounty counter on it"); static { - bountyCounterFilter.add(new ControllerPredicate(TargetController.OPPONENT)); + bountyCounterFilter.add(TargetController.OPPONENT.getControllerPredicate()); bountyCounterFilter.add(new CounterPredicate(CounterType.BOUNTY)); } diff --git a/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java b/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java index db7dc45be6e..5eae2caeac2 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java @@ -15,7 +15,6 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -172,7 +171,7 @@ class SoulbondEntersOtherAbility extends EntersBattlefieldAllTriggeredAbility { static { soulbondFilter.add(Predicates.not(new PairedPredicate())); - soulbondFilter.add(new ControllerPredicate(TargetController.YOU)); + soulbondFilter.add(TargetController.YOU.getControllerPredicate()); soulbondFilter.add(AnotherPredicate.instance); } diff --git a/Mage/src/main/java/mage/abilities/mana/AnyColorLandsProduceManaAbility.java b/Mage/src/main/java/mage/abilities/mana/AnyColorLandsProduceManaAbility.java index d60a9377c26..a45c10b002f 100644 --- a/Mage/src/main/java/mage/abilities/mana/AnyColorLandsProduceManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/AnyColorLandsProduceManaAbility.java @@ -73,7 +73,7 @@ class AnyColorLandsProduceManaEffect extends ManaEffect { this.filter = filter.copy(); } this.onlyColors = onlyColors; - this.filter.add(new ControllerPredicate(targetController)); + this.filter.add(targetController.getControllerPredicate()); String text = targetController == TargetController.OPPONENT ? "an opponent controls" : "you control"; staticText = "Add one mana of any " + (this.onlyColors ? "color" : "type") + " that a " + (filter == null ? "land " : filter.getMessage() + " ") + text + " could produce"; diff --git a/Mage/src/main/java/mage/abilities/mana/AnyColorPermanentTypesManaAbility.java b/Mage/src/main/java/mage/abilities/mana/AnyColorPermanentTypesManaAbility.java index 6da2e90e69f..84ac4f9a8bc 100644 --- a/Mage/src/main/java/mage/abilities/mana/AnyColorPermanentTypesManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/AnyColorPermanentTypesManaAbility.java @@ -16,7 +16,6 @@ import mage.constants.ColoredManaSymbol; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -69,7 +68,7 @@ class AnyColorPermanentTypesManaEffect extends ManaEffect { super(); filter = permanentTypes; this.onlyColors = onlyColors; - filter.add(new ControllerPredicate(targetController)); + filter.add(targetController.getControllerPredicate()); String text = targetController == TargetController.OPPONENT ? "an opponent controls." : "you control."; staticText = "Add one mana of any " + (this.onlyColors ? "color" : "type") + " among " + permanentTypes.getMessage() + " " + text; } diff --git a/Mage/src/main/java/mage/constants/TargetController.java b/Mage/src/main/java/mage/constants/TargetController.java index 23797e9125e..067b2ea374a 100644 --- a/Mage/src/main/java/mage/constants/TargetController.java +++ b/Mage/src/main/java/mage/constants/TargetController.java @@ -36,7 +36,7 @@ public enum TargetController { TargetController() { this.ownerPredicate = this.getOwnerPredicate(); this.playerPredicate = new PlayerPredicate(this); - this.controllerPredicate = new ControllerPredicate(this); + this.controllerPredicate = this.getControllerPredicate(); this.damagedPlayerThisTurnPredicate = new DamagedPlayerThisTurnPredicate(this); } diff --git a/Mage/src/main/java/mage/filter/StaticFilters.java b/Mage/src/main/java/mage/filter/StaticFilters.java index 870bc0f6c36..7e71f5e9cf1 100644 --- a/Mage/src/main/java/mage/filter/StaticFilters.java +++ b/Mage/src/main/java/mage/filter/StaticFilters.java @@ -14,7 +14,6 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.MulticoloredPredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.AttackingPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; /** @@ -304,21 +303,21 @@ public final class StaticFilters { public static final FilterPermanent FILTER_OPPONENTS_PERMANENT = new FilterPermanent("permanent an opponent controls"); static { - FILTER_OPPONENTS_PERMANENT.add(new ControllerPredicate(TargetController.OPPONENT)); + FILTER_OPPONENTS_PERMANENT.add(TargetController.OPPONENT.getControllerPredicate()); FILTER_OPPONENTS_PERMANENT.setLockedFilter(true); } public static final FilterCreaturePermanent FILTER_OPPONENTS_PERMANENT_CREATURE = new FilterCreaturePermanent("creature an opponent controls"); static { - FILTER_OPPONENTS_PERMANENT_CREATURE.add(new ControllerPredicate(TargetController.OPPONENT)); + FILTER_OPPONENTS_PERMANENT_CREATURE.add(TargetController.OPPONENT.getControllerPredicate()); FILTER_OPPONENTS_PERMANENT_CREATURE.setLockedFilter(true); } public static final FilterPermanent FILTER_OPPONENTS_PERMANENT_ARTIFACT = new FilterPermanent("artifact an opponent controls"); static { - FILTER_OPPONENTS_PERMANENT_ARTIFACT.add(new ControllerPredicate(TargetController.OPPONENT)); + FILTER_OPPONENTS_PERMANENT_ARTIFACT.add(TargetController.OPPONENT.getControllerPredicate()); FILTER_OPPONENTS_PERMANENT_ARTIFACT.add(CardType.ARTIFACT.getPredicate()); FILTER_OPPONENTS_PERMANENT_ARTIFACT.setLockedFilter(true); } @@ -326,7 +325,7 @@ public final class StaticFilters { public static final FilterPermanent FILTER_OPPONENTS_PERMANENT_ARTIFACT_OR_CREATURE = new FilterPermanent("artifact or creature an opponent controls"); static { - FILTER_OPPONENTS_PERMANENT_ARTIFACT_OR_CREATURE.add(new ControllerPredicate(TargetController.OPPONENT)); + FILTER_OPPONENTS_PERMANENT_ARTIFACT_OR_CREATURE.add(TargetController.OPPONENT.getControllerPredicate()); FILTER_OPPONENTS_PERMANENT_ARTIFACT_OR_CREATURE.add(Predicates.or( CardType.ARTIFACT.getPredicate(), CardType.CREATURE.getPredicate() @@ -435,7 +434,7 @@ public final class StaticFilters { public static final FilterCreaturePermanent FILTER_PERMANENT_CREATURE_CONTROLLED = new FilterCreaturePermanent("creature you control"); static { - FILTER_PERMANENT_CREATURE_CONTROLLED.add(new ControllerPredicate(TargetController.YOU)); + FILTER_PERMANENT_CREATURE_CONTROLLED.add(TargetController.YOU.getControllerPredicate()); FILTER_PERMANENT_CREATURE_CONTROLLED.setLockedFilter(true); } @@ -448,7 +447,7 @@ public final class StaticFilters { public static final FilterCreaturePermanent FILTER_PERMANENT_CREATURES_CONTROLLED = new FilterCreaturePermanent("creatures you control"); static { - FILTER_PERMANENT_CREATURES_CONTROLLED.add(new ControllerPredicate(TargetController.YOU)); + FILTER_PERMANENT_CREATURES_CONTROLLED.add(TargetController.YOU.getControllerPredicate()); FILTER_PERMANENT_CREATURES_CONTROLLED.setLockedFilter(true); } @@ -491,7 +490,7 @@ public final class StaticFilters { public static final FilterStackObject FILTER_SPELL_OR_ABILITY_OPPONENTS = new FilterStackObject("spell or ability and opponent controls"); static { - FILTER_SPELL_OR_ABILITY_OPPONENTS.add(new ControllerPredicate(TargetController.OPPONENT)); + FILTER_SPELL_OR_ABILITY_OPPONENTS.add(TargetController.OPPONENT.getControllerPredicate()); FILTER_SPELL_OR_ABILITY_OPPONENTS.setLockedFilter(true); } diff --git a/Mage/src/main/java/mage/filter/common/FilterControlledCreatureInPlay.java b/Mage/src/main/java/mage/filter/common/FilterControlledCreatureInPlay.java index 5d1bb188480..1e8b0d139de 100644 --- a/Mage/src/main/java/mage/filter/common/FilterControlledCreatureInPlay.java +++ b/Mage/src/main/java/mage/filter/common/FilterControlledCreatureInPlay.java @@ -5,7 +5,6 @@ import java.util.UUID; import mage.constants.TargetController; import mage.filter.FilterImpl; import mage.filter.FilterInPlay; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -24,7 +23,7 @@ public class FilterControlledCreatureInPlay extends FilterImpl implement public FilterControlledCreatureInPlay(String name) { super(name); creatureFilter = new FilterCreaturePermanent(); - creatureFilter.add(new ControllerPredicate(TargetController.YOU)); + creatureFilter.add(TargetController.YOU.getControllerPredicate()); } @Override diff --git a/Mage/src/main/java/mage/filter/common/FilterControlledPermanent.java b/Mage/src/main/java/mage/filter/common/FilterControlledPermanent.java index 5377dc32a6a..f72c40f461f 100644 --- a/Mage/src/main/java/mage/filter/common/FilterControlledPermanent.java +++ b/Mage/src/main/java/mage/filter/common/FilterControlledPermanent.java @@ -3,7 +3,6 @@ package mage.filter.common; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @author BetaSteward_at_googlemail.com @@ -24,7 +23,7 @@ public class FilterControlledPermanent extends FilterPermanent { public FilterControlledPermanent(SubType subtype, String name) { super(name); - this.add(new ControllerPredicate(TargetController.YOU)); + this.add(TargetController.YOU.getControllerPredicate()); if (subtype != null) { this.add(subtype.getPredicate()); } diff --git a/Mage/src/main/java/mage/filter/common/FilterOpponentsCreaturePermanent.java b/Mage/src/main/java/mage/filter/common/FilterOpponentsCreaturePermanent.java index 7876f195d05..ef20a14cd98 100644 --- a/Mage/src/main/java/mage/filter/common/FilterOpponentsCreaturePermanent.java +++ b/Mage/src/main/java/mage/filter/common/FilterOpponentsCreaturePermanent.java @@ -2,7 +2,6 @@ package mage.filter.common; import mage.constants.SubType; import mage.constants.TargetController; -import mage.filter.predicate.permanent.ControllerPredicate; /* * To change this license header, choose License Headers in Project Properties. @@ -21,13 +20,13 @@ public class FilterOpponentsCreaturePermanent extends FilterCreaturePermanent { public FilterOpponentsCreaturePermanent(String name) { super(name); - this.add(new ControllerPredicate(TargetController.OPPONENT)); + this.add(TargetController.OPPONENT.getControllerPredicate()); } public FilterOpponentsCreaturePermanent(SubType subtype, String name) { super(subtype, name); - this.add(new ControllerPredicate(TargetController.OPPONENT)); + this.add(TargetController.OPPONENT.getControllerPredicate()); } public FilterOpponentsCreaturePermanent(final FilterOpponentsCreaturePermanent filter) { diff --git a/Mage/src/main/java/mage/filter/common/FilterTeamCreaturePermanent.java b/Mage/src/main/java/mage/filter/common/FilterTeamCreaturePermanent.java index 7d6bb67c72b..e7f42f0c581 100644 --- a/Mage/src/main/java/mage/filter/common/FilterTeamCreaturePermanent.java +++ b/Mage/src/main/java/mage/filter/common/FilterTeamCreaturePermanent.java @@ -2,7 +2,6 @@ package mage.filter.common; import mage.constants.SubType; import mage.constants.TargetController; -import mage.filter.predicate.permanent.ControllerPredicate; /* * To change this license header, choose License Headers in Project Properties. @@ -21,13 +20,13 @@ public class FilterTeamCreaturePermanent extends FilterCreaturePermanent { public FilterTeamCreaturePermanent(String name) { super(name); - this.add(new ControllerPredicate(TargetController.TEAM)); + this.add(TargetController.TEAM.getControllerPredicate()); } public FilterTeamCreaturePermanent(SubType subtype, String name) { super(subtype, name); - this.add(new ControllerPredicate(TargetController.TEAM)); + this.add(TargetController.TEAM.getControllerPredicate()); } public FilterTeamCreaturePermanent(final FilterTeamCreaturePermanent filter) { diff --git a/Mage/src/main/java/mage/filter/common/FilterTeamPermanent.java b/Mage/src/main/java/mage/filter/common/FilterTeamPermanent.java index 445088e6607..f7a770e8482 100644 --- a/Mage/src/main/java/mage/filter/common/FilterTeamPermanent.java +++ b/Mage/src/main/java/mage/filter/common/FilterTeamPermanent.java @@ -3,7 +3,6 @@ package mage.filter.common; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /* * To change this license header, choose License Headers in Project Properties. @@ -22,13 +21,13 @@ public class FilterTeamPermanent extends FilterPermanent { public FilterTeamPermanent(String name) { super(name); - this.add(new ControllerPredicate(TargetController.TEAM)); + this.add(TargetController.TEAM.getControllerPredicate()); } public FilterTeamPermanent(SubType subtype, String name) { super(subtype, name); - this.add(new ControllerPredicate(TargetController.TEAM)); + this.add(TargetController.TEAM.getControllerPredicate()); } public FilterTeamPermanent(final FilterTeamPermanent filter) { diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/ControllerPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/ControllerPredicate.java deleted file mode 100644 index d77c180f958..00000000000 --- a/Mage/src/main/java/mage/filter/predicate/permanent/ControllerPredicate.java +++ /dev/null @@ -1,67 +0,0 @@ - -package mage.filter.predicate.permanent; - -import mage.constants.TargetController; -import mage.filter.predicate.ObjectPlayer; -import mage.filter.predicate.ObjectPlayerPredicate; -import mage.game.Controllable; -import mage.game.Game; - -import java.util.UUID; - -/** - * - * @author North - */ -public class ControllerPredicate implements ObjectPlayerPredicate> { - - private final TargetController controller; - - public ControllerPredicate(TargetController controller) { - this.controller = controller; - } - - @Override - public boolean apply(ObjectPlayer input, Game game) { - Controllable object = input.getObject(); - UUID playerId = input.getPlayerId(); - - switch (controller) { - case YOU: - if (object.isControlledBy(playerId)) { - return true; - } - break; - case TEAM: - if (!game.getPlayer(playerId).hasOpponent(object.getControllerId(), game)) { - return true; - } - break; - case OPPONENT: - if (!object.isControlledBy(playerId) - && game.getPlayer(playerId).hasOpponent(object.getControllerId(), game)) { - return true; - } - break; - case NOT_YOU: - if (!object.isControlledBy(playerId)) { - return true; - } - break; - case ACTIVE: - if (object.isControlledBy(game.getActivePlayerId())) { - return true; - } - break; - case ANY: - return true; - } - - return false; - } - - @Override - public String toString() { - return "TargetController(" + controller.toString() + ')'; - } -} diff --git a/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java b/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java index a020c779371..ad4ecfda6d6 100644 --- a/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java @@ -10,7 +10,6 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.command.Emblem; import mage.game.permanent.Permanent; @@ -35,7 +34,7 @@ class KothOfTheHammerThirdEffect extends ContinuousEffectImpl { static { mountains.add(SubType.MOUNTAIN.getPredicate()); - mountains.add(new ControllerPredicate(TargetController.YOU)); + mountains.add(TargetController.YOU.getControllerPredicate()); } public KothOfTheHammerThirdEffect() { diff --git a/Mage/src/main/java/mage/game/command/emblems/TeferiHeroOfDominariaEmblem.java b/Mage/src/main/java/mage/game/command/emblems/TeferiHeroOfDominariaEmblem.java index baee186e0a7..4794fa16c06 100644 --- a/Mage/src/main/java/mage/game/command/emblems/TeferiHeroOfDominariaEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/TeferiHeroOfDominariaEmblem.java @@ -11,7 +11,6 @@ import mage.abilities.effects.common.ExileTargetEffect; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.command.Emblem; import mage.target.TargetPermanent; @@ -26,7 +25,7 @@ public final class TeferiHeroOfDominariaEmblem extends Emblem { this.setName("Emblem Teferi"); Ability ability = new DrawCardControllerTriggeredAbility(Zone.COMMAND, new ExileTargetEffect(), false); FilterPermanent filter = new FilterPermanent("permanent an opponent controls"); - filter.add(new ControllerPredicate(TargetController.OPPONENT)); + filter.add(TargetController.OPPONENT.getControllerPredicate()); ability.addTarget(new TargetPermanent(filter)); this.getAbilities().add(ability); } diff --git a/Mage/src/main/java/mage/game/permanent/token/DoomedArtisanToken.java b/Mage/src/main/java/mage/game/permanent/token/DoomedArtisanToken.java index fa73b61beed..105212f4d89 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DoomedArtisanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DoomedArtisanToken.java @@ -10,7 +10,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @author TheElk801 @@ -21,7 +20,7 @@ public final class DoomedArtisanToken extends TokenImpl { = new FilterCreaturePermanent(SubType.SCULPTURE, "Sculptures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } private static final DynamicValue xValue = new PermanentsOnBattlefieldCount(filter); diff --git a/Mage/src/main/java/mage/game/permanent/token/SpyMasterGoblinToken.java b/Mage/src/main/java/mage/game/permanent/token/SpyMasterGoblinToken.java index 5b7fa6f824b..da3cb49d28b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpyMasterGoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpyMasterGoblinToken.java @@ -11,7 +11,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * @@ -22,7 +21,7 @@ public final class SpyMasterGoblinToken extends TokenImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control"); static { - filter.add(new ControllerPredicate(TargetController.YOU)); + filter.add(TargetController.YOU.getControllerPredicate()); } public SpyMasterGoblinToken() { From 9e7fcd33cdfe4b644f3e9379913f8eecba82c740 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Mon, 6 Jan 2020 20:21:10 -0500 Subject: [PATCH 6/9] fixed some import errors --- Mage.Sets/src/mage/cards/b/ButcherOfMalakir.java | 1 - Mage.Sets/src/mage/cards/c/CrusadingKnight.java | 1 - Mage.Sets/src/mage/cards/d/DreadCharge.java | 1 - Mage.Sets/src/mage/cards/e/EarlOfSquirrel.java | 1 - Mage.Sets/src/mage/cards/g/GontisAetherHeart.java | 1 - Mage.Sets/src/mage/cards/g/GrimContest.java | 1 - Mage.Sets/src/mage/cards/i/IcefallRegent.java | 1 - Mage.Sets/src/mage/cards/s/SabaccGame.java | 1 - Mage.Sets/src/mage/cards/s/SludgeStrider.java | 1 - Mage.Sets/src/mage/cards/s/SwiftKick.java | 1 - .../mage/abilities/mana/AnyColorLandsProduceManaAbility.java | 1 - 11 files changed, 11 deletions(-) diff --git a/Mage.Sets/src/mage/cards/b/ButcherOfMalakir.java b/Mage.Sets/src/mage/cards/b/ButcherOfMalakir.java index c3f0b4fd037..c790bfca658 100644 --- a/Mage.Sets/src/mage/cards/b/ButcherOfMalakir.java +++ b/Mage.Sets/src/mage/cards/b/ButcherOfMalakir.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/c/CrusadingKnight.java b/Mage.Sets/src/mage/cards/c/CrusadingKnight.java index f31e7153e4b..f3833859e9f 100644 --- a/Mage.Sets/src/mage/cards/c/CrusadingKnight.java +++ b/Mage.Sets/src/mage/cards/c/CrusadingKnight.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/d/DreadCharge.java b/Mage.Sets/src/mage/cards/d/DreadCharge.java index db6e74ed04f..b1bc2ea8b1d 100644 --- a/Mage.Sets/src/mage/cards/d/DreadCharge.java +++ b/Mage.Sets/src/mage/cards/d/DreadCharge.java @@ -12,7 +12,6 @@ import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/e/EarlOfSquirrel.java b/Mage.Sets/src/mage/cards/e/EarlOfSquirrel.java index 1e9b1da5c9f..c30f2cc2828 100644 --- a/Mage.Sets/src/mage/cards/e/EarlOfSquirrel.java +++ b/Mage.Sets/src/mage/cards/e/EarlOfSquirrel.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.util.SubTypeList; diff --git a/Mage.Sets/src/mage/cards/g/GontisAetherHeart.java b/Mage.Sets/src/mage/cards/g/GontisAetherHeart.java index 08a770f1cc9..edac7052ffb 100644 --- a/Mage.Sets/src/mage/cards/g/GontisAetherHeart.java +++ b/Mage.Sets/src/mage/cards/g/GontisAetherHeart.java @@ -16,7 +16,6 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; /** * diff --git a/Mage.Sets/src/mage/cards/g/GrimContest.java b/Mage.Sets/src/mage/cards/g/GrimContest.java index d3d9ab9b364..686b2c2cc81 100644 --- a/Mage.Sets/src/mage/cards/g/GrimContest.java +++ b/Mage.Sets/src/mage/cards/g/GrimContest.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/i/IcefallRegent.java b/Mage.Sets/src/mage/cards/i/IcefallRegent.java index dfcd5ab7112..71e5d8e2670 100644 --- a/Mage.Sets/src/mage/cards/i/IcefallRegent.java +++ b/Mage.Sets/src/mage/cards/i/IcefallRegent.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; diff --git a/Mage.Sets/src/mage/cards/s/SabaccGame.java b/Mage.Sets/src/mage/cards/s/SabaccGame.java index 2dbe3743c10..7a60b3d2b1a 100644 --- a/Mage.Sets/src/mage/cards/s/SabaccGame.java +++ b/Mage.Sets/src/mage/cards/s/SabaccGame.java @@ -14,7 +14,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/s/SludgeStrider.java b/Mage.Sets/src/mage/cards/s/SludgeStrider.java index d2bcdfb73f0..d2c35a9dd38 100644 --- a/Mage.Sets/src/mage/cards/s/SludgeStrider.java +++ b/Mage.Sets/src/mage/cards/s/SludgeStrider.java @@ -17,7 +17,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterArtifactCard; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; diff --git a/Mage.Sets/src/mage/cards/s/SwiftKick.java b/Mage.Sets/src/mage/cards/s/SwiftKick.java index 11ddf07a3e1..e01dff09690 100644 --- a/Mage.Sets/src/mage/cards/s/SwiftKick.java +++ b/Mage.Sets/src/mage/cards/s/SwiftKick.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage/src/main/java/mage/abilities/mana/AnyColorLandsProduceManaAbility.java b/Mage/src/main/java/mage/abilities/mana/AnyColorLandsProduceManaAbility.java index a45c10b002f..9b352563898 100644 --- a/Mage/src/main/java/mage/abilities/mana/AnyColorLandsProduceManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/AnyColorLandsProduceManaAbility.java @@ -12,7 +12,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; From 5239d0258b454e011ba52f15b3a8100b304cdc73 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Mon, 6 Jan 2020 20:50:14 -0500 Subject: [PATCH 7/9] fixed another compilation error --- Mage/src/main/java/mage/constants/TargetController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mage/src/main/java/mage/constants/TargetController.java b/Mage/src/main/java/mage/constants/TargetController.java index 067b2ea374a..1c0220833ae 100644 --- a/Mage/src/main/java/mage/constants/TargetController.java +++ b/Mage/src/main/java/mage/constants/TargetController.java @@ -34,9 +34,9 @@ public enum TargetController { private final DamagedPlayerThisTurnPredicate damagedPlayerThisTurnPredicate; TargetController() { - this.ownerPredicate = this.getOwnerPredicate(); + this.ownerPredicate = new OwnerPredicate(this); this.playerPredicate = new PlayerPredicate(this); - this.controllerPredicate = this.getControllerPredicate(); + this.controllerPredicate = new ControllerPredicate(this); this.damagedPlayerThisTurnPredicate = new DamagedPlayerThisTurnPredicate(this); } From dff5c73e1c8b7e9b9a2390f6daf33001c0e2e74e Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Mon, 6 Jan 2020 21:00:57 -0500 Subject: [PATCH 8/9] pulled out DamagedPlayerThisTurnPredicate --- Mage.Sets/src/mage/cards/r/Retaliate.java | 3 +- Mage.Sets/src/mage/cards/s/SpearOfHeliod.java | 3 +- .../java/mage/constants/TargetController.java | 60 ---------------- .../DamagedPlayerThisTurnPredicate.java | 70 +++++++++++++++++++ 4 files changed, 74 insertions(+), 62 deletions(-) create mode 100644 Mage/src/main/java/mage/filter/predicate/permanent/DamagedPlayerThisTurnPredicate.java diff --git a/Mage.Sets/src/mage/cards/r/Retaliate.java b/Mage.Sets/src/mage/cards/r/Retaliate.java index ac49c605a99..3c70272af39 100644 --- a/Mage.Sets/src/mage/cards/r/Retaliate.java +++ b/Mage.Sets/src/mage/cards/r/Retaliate.java @@ -7,6 +7,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.permanent.DamagedPlayerThisTurnPredicate; import java.util.UUID; @@ -19,7 +20,7 @@ public final class Retaliate extends CardImpl { = new FilterCreaturePermanent("creatures that dealt damage to you this turn"); static { - filter.add(TargetController.YOU.getDamagedPlayerThisTurnPredicate()); + filter.add(new DamagedPlayerThisTurnPredicate(TargetController.YOU)); } public Retaliate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpearOfHeliod.java b/Mage.Sets/src/mage/cards/s/SpearOfHeliod.java index d131443bbf1..4ca2c72748c 100644 --- a/Mage.Sets/src/mage/cards/s/SpearOfHeliod.java +++ b/Mage.Sets/src/mage/cards/s/SpearOfHeliod.java @@ -15,6 +15,7 @@ import mage.constants.Duration; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.permanent.DamagedPlayerThisTurnPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; @@ -29,7 +30,7 @@ public final class SpearOfHeliod extends CardImpl { = new FilterCreaturePermanent("creature that dealt damage to you this turn"); static { - filter.add(TargetController.YOU.getDamagedPlayerThisTurnPredicate()); + filter.add(new DamagedPlayerThisTurnPredicate(TargetController.YOU)); } public SpearOfHeliod(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage/src/main/java/mage/constants/TargetController.java b/Mage/src/main/java/mage/constants/TargetController.java index 1c0220833ae..00870ba7ebc 100644 --- a/Mage/src/main/java/mage/constants/TargetController.java +++ b/Mage/src/main/java/mage/constants/TargetController.java @@ -8,7 +8,6 @@ import mage.filter.predicate.ObjectSourcePlayerPredicate; import mage.game.Controllable; import mage.game.Game; import mage.players.Player; -import mage.watchers.common.PlayerDamagedBySourceWatcher; import java.util.UUID; @@ -31,13 +30,11 @@ public enum TargetController { private final OwnerPredicate ownerPredicate; private final PlayerPredicate playerPredicate; private final ControllerPredicate controllerPredicate; - private final DamagedPlayerThisTurnPredicate damagedPlayerThisTurnPredicate; TargetController() { this.ownerPredicate = new OwnerPredicate(this); this.playerPredicate = new PlayerPredicate(this); this.controllerPredicate = new ControllerPredicate(this); - this.damagedPlayerThisTurnPredicate = new DamagedPlayerThisTurnPredicate(this); } public OwnerPredicate getOwnerPredicate() { @@ -198,61 +195,4 @@ public enum TargetController { return "TargetController(" + controller.toString() + ')'; } } - - public static class DamagedPlayerThisTurnPredicate implements ObjectPlayerPredicate> { - - private final TargetController controller; - - public DamagedPlayerThisTurnPredicate(TargetController controller) { - this.controller = controller; - } - - @Override - public boolean apply(ObjectPlayer input, Game game) { - Controllable object = input.getObject(); - UUID playerId = input.getPlayerId(); - - switch (controller) { - case YOU: - PlayerDamagedBySourceWatcher watcher = game.getState().getWatcher(PlayerDamagedBySourceWatcher.class, playerId); - if (watcher != null) { - return watcher.hasSourceDoneDamage(object.getId(), game); - } - break; - case OPPONENT: - for (UUID opponentId : game.getOpponents(playerId)) { - watcher = game.getState().getWatcher(PlayerDamagedBySourceWatcher.class, opponentId); - if (watcher != null) { - return watcher.hasSourceDoneDamage(object.getId(), game); - } - } - break; - case NOT_YOU: - for (UUID notYouId : game.getState().getPlayersInRange(playerId, game)) { - if (!notYouId.equals(playerId)) { - watcher = game.getState().getWatcher(PlayerDamagedBySourceWatcher.class, notYouId); - if (watcher != null) { - return watcher.hasSourceDoneDamage(object.getId(), game); - } - } - } - break; - case ANY: - for (UUID anyId : game.getState().getPlayersInRange(playerId, game)) { - watcher = game.getState().getWatcher(PlayerDamagedBySourceWatcher.class, anyId); - if (watcher != null) { - return watcher.hasSourceDoneDamage(object.getId(), game); - } - } - return true; - } - - return false; - } - - @Override - public String toString() { - return "Damaged player (" + controller.toString() + ')'; - } - } } diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/DamagedPlayerThisTurnPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/DamagedPlayerThisTurnPredicate.java new file mode 100644 index 00000000000..3fb4305a6b5 --- /dev/null +++ b/Mage/src/main/java/mage/filter/predicate/permanent/DamagedPlayerThisTurnPredicate.java @@ -0,0 +1,70 @@ +package mage.filter.predicate.permanent; + +import mage.constants.TargetController; +import mage.filter.predicate.ObjectPlayer; +import mage.filter.predicate.ObjectPlayerPredicate; +import mage.game.Controllable; +import mage.game.Game; +import mage.watchers.common.PlayerDamagedBySourceWatcher; + +import java.util.UUID; + +/** + * @author LevelX2 + */ +public class DamagedPlayerThisTurnPredicate implements ObjectPlayerPredicate> { + + private final TargetController controller; + + public DamagedPlayerThisTurnPredicate(TargetController controller) { + this.controller = controller; + } + + @Override + public boolean apply(ObjectPlayer input, Game game) { + Controllable object = input.getObject(); + UUID playerId = input.getPlayerId(); + + switch (controller) { + case YOU: + PlayerDamagedBySourceWatcher watcher = game.getState().getWatcher(PlayerDamagedBySourceWatcher.class, playerId); + if (watcher != null) { + return watcher.hasSourceDoneDamage(object.getId(), game); + } + break; + case OPPONENT: + for (UUID opponentId : game.getOpponents(playerId)) { + watcher = game.getState().getWatcher(PlayerDamagedBySourceWatcher.class, opponentId); + if (watcher != null) { + return watcher.hasSourceDoneDamage(object.getId(), game); + } + } + break; + case NOT_YOU: + for (UUID notYouId : game.getState().getPlayersInRange(playerId, game)) { + if (!notYouId.equals(playerId)) { + watcher = game.getState().getWatcher(PlayerDamagedBySourceWatcher.class, notYouId); + if (watcher != null) { + return watcher.hasSourceDoneDamage(object.getId(), game); + } + } + } + break; + case ANY: + for (UUID anyId : game.getState().getPlayersInRange(playerId, game)) { + watcher = game.getState().getWatcher(PlayerDamagedBySourceWatcher.class, anyId); + if (watcher != null) { + return watcher.hasSourceDoneDamage(object.getId(), game); + } + } + return true; + } + + return false; + } + + @Override + public String toString() { + return "Damaged player (" + controller.toString() + ')'; + } +} From 41407a4aee7742d2b7b2aab9836024086e700ba4 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Mon, 6 Jan 2020 21:05:11 -0500 Subject: [PATCH 9/9] added lazy loading to getter methods --- .../java/mage/constants/TargetController.java | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/Mage/src/main/java/mage/constants/TargetController.java b/Mage/src/main/java/mage/constants/TargetController.java index 00870ba7ebc..1999653a33c 100644 --- a/Mage/src/main/java/mage/constants/TargetController.java +++ b/Mage/src/main/java/mage/constants/TargetController.java @@ -27,37 +27,36 @@ public enum TargetController { NEXT, EACH_PLAYER; - private final OwnerPredicate ownerPredicate; - private final PlayerPredicate playerPredicate; - private final ControllerPredicate controllerPredicate; - - TargetController() { - this.ownerPredicate = new OwnerPredicate(this); - this.playerPredicate = new PlayerPredicate(this); - this.controllerPredicate = new ControllerPredicate(this); - } + private OwnerPredicate ownerPredicate = null; + private PlayerPredicate playerPredicate = null; + private ControllerPredicate controllerPredicate = null; public OwnerPredicate getOwnerPredicate() { - return ownerPredicate; + if (this.ownerPredicate == null) { + this.ownerPredicate = new OwnerPredicate(this); + } + return this.ownerPredicate; } public PlayerPredicate getPlayerPredicate() { - return playerPredicate; + if (this.playerPredicate == null) { + this.playerPredicate = new PlayerPredicate(this); + } + return this.playerPredicate; } public ControllerPredicate getControllerPredicate() { - return controllerPredicate; - } - - public DamagedPlayerThisTurnPredicate getDamagedPlayerThisTurnPredicate() { - return damagedPlayerThisTurnPredicate; + if (this.controllerPredicate == null) { + this.controllerPredicate = new ControllerPredicate(this); + } + return this.controllerPredicate; } public static class OwnerPredicate implements ObjectPlayerPredicate> { private final TargetController targetOwner; - public OwnerPredicate(TargetController targetOwner) { + private OwnerPredicate(TargetController targetOwner) { this.targetOwner = targetOwner; } @@ -103,7 +102,7 @@ public enum TargetController { private final TargetController targetPlayer; - public PlayerPredicate(TargetController player) { + private PlayerPredicate(TargetController player) { this.targetPlayer = player; } @@ -147,7 +146,7 @@ public enum TargetController { private final TargetController controller; - public ControllerPredicate(TargetController controller) { + private ControllerPredicate(TargetController controller) { this.controller = controller; }