From 0681edfa484fef6aba2434066a4c0bada4086fae Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Sat, 23 Sep 2017 18:52:18 -0400 Subject: [PATCH] updated defending player predicate again --- .../predicate/permanent/DefendingPlayerControlsPredicate.java | 4 ++-- .../predicate/permanent/DefendingPlayerOwnsCardPredicate.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/DefendingPlayerControlsPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/DefendingPlayerControlsPredicate.java index ee0606669b..af1a7d4c90 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/DefendingPlayerControlsPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/DefendingPlayerControlsPredicate.java @@ -34,13 +34,13 @@ import mage.game.permanent.Permanent; /** * - * @author North + * @author TheElk801 */ public class DefendingPlayerControlsPredicate implements ObjectSourcePlayerPredicate> { @Override public boolean apply(ObjectSourcePlayer 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 diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/DefendingPlayerOwnsCardPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/DefendingPlayerOwnsCardPredicate.java index a46ebcb3d7..fbe57d8ffb 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/DefendingPlayerOwnsCardPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/DefendingPlayerOwnsCardPredicate.java @@ -34,13 +34,13 @@ import mage.game.Game; /** * - * @author North + * @author TheElk801 */ public class DefendingPlayerOwnsCardPredicate implements ObjectSourcePlayerPredicate> { @Override public boolean apply(ObjectSourcePlayer 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