forked from External/mage
(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:
parent
53877424a0
commit
80e11b2052
1719 changed files with 3384 additions and 3325 deletions
|
|
@ -126,16 +126,16 @@ class ChandraPyromasterTarget extends TargetPermanent {
|
|||
}
|
||||
|
||||
@Override
|
||||
public Set<UUID> possibleTargets(UUID sourceId, UUID sourceControllerId, Game game) {
|
||||
Set<UUID> availablePossibleTargets = super.possibleTargets(sourceId, sourceControllerId, game);
|
||||
public Set<UUID> possibleTargets(UUID sourceControllerId, Ability source, Game game) {
|
||||
Set<UUID> availablePossibleTargets = super.possibleTargets(sourceControllerId, source, game);
|
||||
Set<UUID> possibleTargets = new HashSet<>();
|
||||
MageObject object = game.getObject(sourceId);
|
||||
MageObject object = game.getObject(source);
|
||||
|
||||
for (StackObject item : game.getState().getStack()) {
|
||||
if (item.getId().equals(sourceId)) {
|
||||
if (item.getId().equals(source.getSourceId())) {
|
||||
object = item;
|
||||
}
|
||||
if (item.getSourceId().equals(sourceId)) {
|
||||
if (item.getSourceId().equals(source.getSourceId())) {
|
||||
object = item;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue