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

10
Mage/src/main/java/mage/target/common/TargetPermanentOrPlayerAmount.java
View file

@ -72,7 +72,7 @@ public abstract class TargetPermanentOrPlayerAmount extends TargetAmount {
MageObject targetSource = source.getSourceObject(game);
if (permanent != null) {
return permanent.canBeTargetedBy(targetSource, source.getControllerId(), game)
&& filter.match(permanent, source.getSourceId(), source.getControllerId(), game);
&& filter.match(permanent, source.getControllerId(), source, game);
}
if (player != null) {
return player.canBeTargetedBy(targetSource, source.getControllerId(), game)
@ -92,10 +92,10 @@ public abstract class TargetPermanentOrPlayerAmount extends TargetAmount {
}
@Override
public boolean canChoose(UUID sourceId, UUID sourceControllerId, Game game) {
public boolean canChoose(UUID sourceControllerId, Ability source, Game game) {
// no max targets limit here
int count = 0;
MageObject targetSource = game.getObject(sourceId);
MageObject targetSource = game.getObject(source);
for (UUID playerId : game.getState().getPlayersInRange(sourceControllerId, game)) {
Player player = game.getPlayer(playerId);
if (player == null
@ -144,7 +144,7 @@ public abstract class TargetPermanentOrPlayerAmount extends TargetAmount {
}
@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<>();
// max targets limit reached (only selected can be choosen again)
@ -153,7 +153,7 @@ public abstract class TargetPermanentOrPlayerAmount extends TargetAmount {
return possibleTargets;
}
MageObject targetSource = game.getObject(sourceId);
MageObject targetSource = game.getObject(source);
game.getState()
.getPlayersInRange(sourceControllerId, game)