mirror of
https://github.com/correl/mage.git
synced 2025-04-10 17:00:08 -09:00
fixed Silver Wyvern error (fixes #6768)
This commit is contained in:
parent
8392b652b7
commit
3f88f350f6
1 changed files with 6 additions and 3 deletions
|
@ -71,7 +71,12 @@ enum SilverWyvernPredicate implements ObjectSourcePlayerPredicate<ObjectSourcePl
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean apply(ObjectSourcePlayer<StackObject> input, Game game) {
|
public boolean apply(ObjectSourcePlayer<StackObject> input, Game game) {
|
||||||
Stream<UUID> stream = input.getObject()
|
return makeStream(input, game).anyMatch(input.getSourceId()::equals)
|
||||||
|
&& makeStream(input, game).allMatch(input.getSourceId()::equals);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final Stream<UUID> makeStream(ObjectSourcePlayer<StackObject> input, Game game) {
|
||||||
|
return input.getObject()
|
||||||
.getStackAbility()
|
.getStackAbility()
|
||||||
.getTargets()
|
.getTargets()
|
||||||
.stream()
|
.stream()
|
||||||
|
@ -80,7 +85,5 @@ enum SilverWyvernPredicate implements ObjectSourcePlayerPredicate<ObjectSourcePl
|
||||||
.map(game::getPermanent)
|
.map(game::getPermanent)
|
||||||
.filter(Objects::nonNull)
|
.filter(Objects::nonNull)
|
||||||
.map(MageItem::getId);
|
.map(MageItem::getId);
|
||||||
return stream.allMatch(input.getSourceId()::equals)
|
|
||||||
&& stream.anyMatch(input.getSourceId()::equals);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue