github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 11:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed Run Away Together targeting incorrectly

Browse source
This commit is contained in:
Evan Kranzler 2019-09-21 15:20:07 -04:00
parent 4afc35caf0
commit 25c40b5857
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Mage.Sets/src/mage/cards/r/RunAwayTogether.java
View file

@ -5,11 +5,12 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
import java.util.Objects;
import java.util.UUID; import java.util.UUID;
/** /**
@ -21,7 +22,10 @@ public final class RunAwayTogether extends CardImpl {
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{U}"); super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{U}");
// Choose two target creatures controlled by different players. Return those creatures to their owners' hands. // Choose two target creatures controlled by different players. Return those creatures to their owners' hands.
this.getSpellAbility().addEffect(new ReturnToHandTargetEffect(true)); this.getSpellAbility().addEffect(new ReturnToHandTargetEffect(true)
.setText("Choose two target creatures controlled by different players. " +
"Return those creatures to their owners' hands.")
);
this.getSpellAbility().addTarget(new RunAwayTogetherTarget()); this.getSpellAbility().addTarget(new RunAwayTogetherTarget());
} }
@ -37,8 +41,11 @@ public final class RunAwayTogether extends CardImpl {
class RunAwayTogetherTarget extends TargetCreaturePermanent { class RunAwayTogetherTarget extends TargetCreaturePermanent {
private static final FilterCreaturePermanent filter
= new FilterCreaturePermanent("creatures controlled by different players");
RunAwayTogetherTarget() { RunAwayTogetherTarget() {
super(2, 2, StaticFilters.FILTER_PERMANENT_CREATURE, false); super(2, 2, filter, false);
} }
private RunAwayTogetherTarget(final RunAwayTogetherTarget target) { private RunAwayTogetherTarget(final RunAwayTogetherTarget target) {
@ -59,12 +66,12 @@ class RunAwayTogetherTarget extends TargetCreaturePermanent {
if (creature == null) { if (creature == null) {
return false; return false;
} }
return !this.getTargets() return this.getTargets()
.stream() .stream()
.map(game::getPermanent) .map(game::getPermanent)
.anyMatch(permanent -> permanent != null .filter(Objects::nonNull)
&& !creature.getId().equals(permanent.getId()) .noneMatch(permanent -> creature.getId().equals(permanent.getId())
&& !creature.isControlledBy(permanent.getControllerId()) || creature.isControlledBy(permanent.getControllerId())
); );
} }
} }