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

8
Mage/src/main/java/mage/target/common/TargetCardInExile.java
View file

@ -52,7 +52,7 @@ public class TargetCardInExile extends TargetCard {
}
@Override
public Set<UUID> possibleTargets(UUID sourceId, UUID sourceControllerId, Game game) {
public Set<UUID> possibleTargets(UUID sourceControllerId, Ability source, Game game) {
Set<UUID> possibleTargets = new HashSet<>();
if (allExileZones) {
for (Card card : game.getExile().getAllCards(game)) {
@ -74,11 +74,11 @@ public class TargetCardInExile extends TargetCard {
}
@Override
public boolean canChoose(UUID sourceId, UUID sourceControllerId, Game game) {
public boolean canChoose(UUID sourceControllerId, Ability source, Game game) {
if (allExileZones) {
int numberTargets = 0;
for(ExileZone exileZone : game.getExile().getExileZones()) {
numberTargets += exileZone.count(filter, sourceId, sourceControllerId, game);
numberTargets += exileZone.count(filter, sourceControllerId, source, game);
if (numberTargets >= this.minNumberOfTargets) {
return true;
}
@ -86,7 +86,7 @@ public class TargetCardInExile extends TargetCard {
} else {
ExileZone exileZone = game.getExile().getExileZone(zoneId);
if (exileZone != null) {
if (exileZone.count(filter, sourceId, sourceControllerId, game) >= this.minNumberOfTargets) {
if (exileZone.count(filter, sourceControllerId, source, game) >= this.minNumberOfTargets) {
return true;
}
}