External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-22 11:32:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

updated defending player predicate again

Browse source
This commit is contained in:
Evan Kranzler 2017-09-23 18:52:18 -04:00
parent 631acef6b9
commit 0681edfa48
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/main/java/mage/filter/predicate/permanent/DefendingPlayerControlsPredicate.java
View file

@ -34,13 +34,13 @@ import mage.game.permanent.Permanent;
/** /**
* *
* @author North * @author TheElk801
*/ */
public class DefendingPlayerControlsPredicate implements ObjectSourcePlayerPredicate<ObjectSourcePlayer<Permanent>> { public class DefendingPlayerControlsPredicate implements ObjectSourcePlayerPredicate<ObjectSourcePlayer<Permanent>> {
@Override @Override
public boolean apply(ObjectSourcePlayer<Permanent> input, Game game) { public boolean apply(ObjectSourcePlayer<Permanent> input, Game game) {
return input.getObject().getControllerId().equals(game.getCombat().getDefendingPlayerId(input.getSourceId())); return input.getObject().getControllerId().equals(game.getCombat().getDefendingPlayerId(input.getSourceId(), game));
} }
@Override @Override

4
Mage/src/main/java/mage/filter/predicate/permanent/DefendingPlayerOwnsCardPredicate.java
View file

@ -34,13 +34,13 @@ import mage.game.Game;
/** /**
* *
* @author North * @author TheElk801
*/ */
public class DefendingPlayerOwnsCardPredicate implements ObjectSourcePlayerPredicate<ObjectSourcePlayer<Card>> { public class DefendingPlayerOwnsCardPredicate implements ObjectSourcePlayerPredicate<ObjectSourcePlayer<Card>> {
@Override @Override
public boolean apply(ObjectSourcePlayer<Card> input, Game game) { public boolean apply(ObjectSourcePlayer<Card> input, Game game) {
return input.getObject().getOwnerId().equals(game.getCombat().getDefendingPlayerId(input.getSourceId())); return input.getObject().getOwnerId().equals(game.getCombat().getDefendingPlayerId(input.getSourceId(), game));
} }
@Override @Override