From e6e241cfcb09afc83062950defd04f8d22f4521b Mon Sep 17 00:00:00 2001 From: xenohedron Date: Tue, 10 Oct 2023 23:22:09 -0400 Subject: [PATCH] fix notTarget handling in TargetPermanentAmount --- .../main/java/mage/target/common/TargetPermanentAmount.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mage/src/main/java/mage/target/common/TargetPermanentAmount.java b/Mage/src/main/java/mage/target/common/TargetPermanentAmount.java index 4f31b5d388a..9f727eda34e 100644 --- a/Mage/src/main/java/mage/target/common/TargetPermanentAmount.java +++ b/Mage/src/main/java/mage/target/common/TargetPermanentAmount.java @@ -72,7 +72,7 @@ public class TargetPermanentAmount extends TargetAmount { return filter.match(permanent, game); } MageObject targetSource = source.getSourceObject(game); - return permanent.canBeTargetedBy(targetSource, source.getControllerId(), game) + return (notTarget || permanent.canBeTargetedBy(targetSource, source.getControllerId(), game)) && filter.match(permanent, source.getControllerId(), source, game); } @@ -106,7 +106,7 @@ public class TargetPermanentAmount extends TargetAmount { .getActivePermanents(filter, sourceControllerId, source, game) .stream() .filter(Objects::nonNull) - .filter(permanent -> permanent.canBeTargetedBy(targetSource, sourceControllerId, game)) + .filter(permanent -> notTarget || permanent.canBeTargetedBy(targetSource, sourceControllerId, game)) .map(Permanent::getId) .collect(Collectors.toSet()); }