diff --git a/Mage.Sets/src/mage/cards/b/BattleForBretagard.java b/Mage.Sets/src/mage/cards/b/BattleForBretagard.java index 5daffe0912c..edaa0c7dd5c 100644 --- a/Mage.Sets/src/mage/cards/b/BattleForBretagard.java +++ b/Mage.Sets/src/mage/cards/b/BattleForBretagard.java @@ -133,9 +133,11 @@ class BattleForBretagardTarget extends TargetPermanent { Set names = this.getTargets() .stream() .map(game::getPermanent) - .map(MageObject::getName) .filter(Objects::nonNull) + .map(MageObject::getName) .collect(Collectors.toSet()); + names.removeIf(Objects::isNull); + names.removeIf(String::isEmpty); Permanent permanent = game.getPermanent(id); return permanent != null && !names.contains(permanent.getName()); } @@ -147,12 +149,14 @@ class BattleForBretagardTarget extends TargetPermanent { Set names = this.getTargets() .stream() .map(game::getPermanent) - .map(MageObject::getName) .filter(Objects::nonNull) + .map(MageObject::getName) .collect(Collectors.toSet()); + names.removeIf(Objects::isNull); + names.removeIf(String::isEmpty); possibleTargets.removeIf(uuid -> { Permanent permanent = game.getPermanent(uuid); - return permanent != null && !names.contains(permanent.getName()); + return permanent == null || names.contains(permanent.getName()); }); return possibleTargets; }