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/TargetImpl.java
View file

@ -269,7 +269,7 @@ public abstract class TargetImpl implements Target {
}
@Override
public boolean choose(Outcome outcome, UUID playerId, UUID sourceId, Game game) {
public boolean choose(Outcome outcome, UUID playerId, UUID sourceId, Ability source, Game game) {
Player targetController = getTargetController(game, playerId);
if (targetController == null) {
return false;
@ -280,7 +280,7 @@ public abstract class TargetImpl implements Target {
if (!targetController.canRespond()) {
return chosen;
}
if (!targetController.choose(outcome, this, sourceId, game)) {
if (!targetController.choose(outcome, this, source, game)) {
return chosen;
}
chosen = targets.size() >= getNumberOfTargets();
@ -295,7 +295,7 @@ public abstract class TargetImpl implements Target {
return false;
}
List<UUID> possibleTargets = new ArrayList<>(possibleTargets(source.getSourceId(), playerId, game));
List<UUID> possibleTargets = new ArrayList<>(possibleTargets(playerId, source, game));
chosen = targets.size() >= getNumberOfTargets();
do {
@ -385,7 +385,7 @@ public abstract class TargetImpl implements Target {
public List<? extends TargetImpl> getTargetOptions(Ability source, Game game) {
List<TargetImpl> options = new ArrayList<>();
List<UUID> possibleTargets = new ArrayList<>();
possibleTargets.addAll(possibleTargets(source.getSourceId(), source.getControllerId(), game));
possibleTargets.addAll(possibleTargets(source.getControllerId(), source, game));
possibleTargets.removeAll(getTargets());
// get the length of the array