Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

refactored PlayerPredicate

Browse source
This commit is contained in:
Evan Kranzler 2020-01-06 19:53:29 -05:00
parent 8e29454916
commit 13d76bfc06
11 changed files with 23 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage/src/main/java/mage/abilities/costs/common/GainLifeOpponentCost.java
View file

@ -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
}

3
Mage/src/main/java/mage/abilities/keyword/AssistAbility.java
View file

@ -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() {