External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix SourceTargetsPermanentCondition

Browse source
This commit is contained in:
xenohedron 2024-05-06 00:15:22 -04:00
parent d1cca988c4
commit a97dec3e97
2 changed files with 88 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Mage/src/main/java/mage/abilities/condition/common/SourceTargetsPermanentCondition.java
View file

@ -4,11 +4,9 @@ import mage.abilities.Ability;
import mage.abilities.condition.Condition;
import mage.filter.FilterPermanent;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.game.stack.StackObject;
import mage.target.Target;
import java.util.Iterator;
import java.util.Objects;
/**
* @author TheElk801
@ -23,18 +21,16 @@ public class SourceTargetsPermanentCondition implements Condition {
@Override
public boolean apply(Game game, Ability source) {
StackObject sourceSpell = game.getStack().getStackObject(source.getSourceId());
if (sourceSpell == null) {
StackObject stackObject = game.getStack().getStackObject(source.getSourceId());
if (stackObject == null) {
return false;
}
Iterator<Target> targets = sourceSpell.getStackAbility().getTargets().iterator();
while (targets.hasNext()) {
Permanent permanent = game.getPermanentOrLKIBattlefield(targets.next().getFirstTarget());
if (filter.match(permanent, source.getControllerId(), source, game)) {
return true;
}
}
return false;
return stackObject.getStackAbility().getTargets()
.stream()
.flatMap(t -> t.getTargets().stream())
.map(game::getPermanentOrLKIBattlefield)
.filter(Objects::nonNull)
.anyMatch(p -> filter.match(p, source.getControllerId(), source, game));
}
@Override