diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index d53ea918357..b777fb03690 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -6791,7 +6791,7 @@ public class Card extends GameEntity implements Comparable { return false; } } - } else if (property.startsWith("shareControllerWith")) { + } else if (property.startsWith("sharesControllerWith")) { if (property.equals("sharesControllerWith")) { if (!this.sharesControllerWith(source)) { return false; diff --git a/src/main/java/forge/card/spellability/TargetSelection.java b/src/main/java/forge/card/spellability/TargetSelection.java index 4b6a6678931..adee17535e6 100644 --- a/src/main/java/forge/card/spellability/TargetSelection.java +++ b/src/main/java/forge/card/spellability/TargetSelection.java @@ -286,15 +286,16 @@ public class TargetSelection { choices.remove(c); } } - + // If all cards (including subability targets) must have the same controller if (tgt.isSameController() && !objects.isEmpty()) { final List list = new ArrayList(); - for (final Object o : objects) + for (final Object o : objects) { if (o instanceof Card) { list.add((Card) o); } - if (!list.isEmpty()){ + } + if (!list.isEmpty()) { final Card card = list.get(0); choices = CardLists.filter(choices, new Predicate() { @Override