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/abilities/effects/common/CopyPermanentEffect.java
View file

@ -80,7 +80,7 @@ public class CopyPermanentEffect extends OneShotEffect {
Player controller = game.getPlayer(source.getControllerId());
MageObject sourcePermanent = game.getPermanentEntering(source.getSourceId());
if (sourcePermanent == null) {
sourcePermanent = game.getObject(source.getSourceId());
sourcePermanent = game.getObject(source);
}
if (controller == null || sourcePermanent == null) {
return false;
@ -91,8 +91,8 @@ public class CopyPermanentEffect extends OneShotEffect {
} else {
Target target = new TargetPermanent(filter);
target.setNotTarget(true);
if (target.canChoose(source.getSourceId(), controller.getId(), game)) {
controller.choose(Outcome.Copy, target, source.getSourceId(), game);
if (target.canChoose(controller.getId(), source, game)) {
controller.choose(Outcome.Copy, target, source, game);
copyFromPermanent = game.getPermanent(target.getFirstTarget());
}
}
@ -157,7 +157,7 @@ public class CopyPermanentEffect extends OneShotEffect {
// select new target
auraTarget.setNotTarget(true);
if (!controller.choose(auraOutcome, auraTarget, source.getSourceId(), game)) {
if (!controller.choose(auraOutcome, auraTarget, source, game)) {
return true;
}
UUID targetId = auraTarget.getFirstTarget();