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

* 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

View file

@ -38,8 +38,8 @@ public class CardsInAllGraveyardsCount implements DynamicValue {
.filter(Objects::nonNull)
.map(Player::getGraveyard)
.mapToInt(graveyard -> graveyard.count(
filter, sourceAbility.getSourceId(),
sourceAbility.getControllerId(), game
filter,
sourceAbility.getControllerId(), sourceAbility, game
)).sum();
}