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

[NEO] fixed Mechtitan Core error when exiling only tokens

Browse source
This commit is contained in:
Evan Kranzler 2022-02-19 09:49:50 -05:00
parent 4dfd0867ed
commit ac56e8dd24
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Mage/src/main/java/mage/target/targetpointer/FixedTargets.java
View file

@ -32,10 +32,11 @@ public class FixedTargets extends TargetPointerImpl {
public FixedTargets(Cards cards, Game game) {
super();
for (UUID targetId : cards) {
MageObjectReference mor = new MageObjectReference(targetId, game);
targets.add(mor);
if (cards != null) {
for (UUID targetId : cards) {
MageObjectReference mor = new MageObjectReference(targetId, game);
targets.add(mor);
}
}
this.initialized = true;
}
@ -92,24 +93,24 @@ public class FixedTargets extends TargetPointerImpl {
@Override
public List<UUID> getTargets(Game game, Ability source) {
// check target not changed zone
List<UUID> list = new ArrayList<>();
for (MageObjectReference mor : targets) {
if (mor.getSourceId() != null && game.getState().getZoneChangeCounter(mor.getSourceId()) == mor.getZoneChangeCounter()) {
list.add(mor.getSourceId());
}
}
return list;
return targets
.stream()
.filter(mor -> mor.zoneCounterIsCurrent(game))
.map(MageObjectReference::getSourceId)
.filter(Objects::nonNull)
.collect(Collectors.toList());
}
@Override
public UUID getFirst(Game game, Ability source) {
// check target not changed zone
for (MageObjectReference mor : targets) {
if (game.getState().getZoneChangeCounter(mor.getSourceId()) == mor.getZoneChangeCounter()) {
return mor.getSourceId();
}
}
return null;
return targets
.stream()
.filter(mor -> mor.zoneCounterIsCurrent(game))
.map(MageObjectReference::getSourceId)
.filter(Objects::nonNull)
.findFirst()
.orElse(null);
}
@Override