Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

(WIP) Replacing blocking/blocked by predicates (#8729)

Browse source 
* replaced blocking/blocked by predicates

* added test for knight of dusk (currently fails)

* added source parameter to filters and everything else that needs it

* some changes to various predicates

* test fix

* small changes to filter code

* merge fix

* fixed a test failure

* small change to Karn, Scion of Urza

* removed sourceId from filter methods and other similar places

* added new getobject method to fix some test failures

* a few more fixes

* fixed merge conflicts

* merge fix
This commit is contained in:
Evan Kranzler 2022-03-23 18:45:02 -04:00 • committed by GitHub
parent 53877424a0
commit 80e11b2052
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1719 changed files with 3384 additions and 3325 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Mage/src/main/java/mage/target/common/TargetPermanentAmount.java
View file

@ -73,7 +73,7 @@ public class TargetPermanentAmount extends TargetAmount {
}
MageObject targetSource = source.getSourceObject(game);
return permanent.canBeTargetedBy(targetSource, source.getControllerId(), game)
&& filter.match(permanent, source.getSourceId(), source.getControllerId(), game);
&& filter.match(permanent, source.getControllerId(), source, game);
}
@Override
@ -82,8 +82,8 @@ public class TargetPermanentAmount extends TargetAmount {
}
@Override
public boolean canChoose(UUID sourceId, UUID sourceControllerId, Game game) {
return game.getBattlefield().getActivePermanents(filter, sourceControllerId, sourceId, game).size()
public boolean canChoose(UUID sourceControllerId, Ability source, Game game) {
return game.getBattlefield().getActivePermanents(filter, sourceControllerId, source, game).size()
>= this.minNumberOfTargets;
}
@ -94,16 +94,16 @@ public class TargetPermanentAmount extends TargetAmount {
}
@Override
public Set<UUID> possibleTargets(UUID sourceId, UUID sourceControllerId, Game game) {
public Set<UUID> possibleTargets(UUID sourceControllerId, Ability source, Game game) {
if (getMaxNumberOfTargets() > 0 && getTargets().size() >= getMaxNumberOfTargets()) {
return getTargets()
.stream()
.collect(Collectors.toSet());
}
MageObject targetSource = game.getObject(sourceId);
MageObject targetSource = game.getObject(source);
return game
.getBattlefield()
.getActivePermanents(filter, sourceControllerId, sourceId, game)
.getActivePermanents(filter, sourceControllerId, source, game)
.stream()
.filter(Objects::nonNull)
.filter(permanent -> permanent.canBeTargetedBy(targetSource, sourceControllerId, game))