Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

- Aftermath keyword works again. Added test for Aftermath keyword.

Browse source
This commit is contained in:
Achilles 2018-01-12 23:58:38 -06:00
parent a0bd835e34
commit 7ade17595d
2 changed files with 32 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage/src/main/java/mage/players/PlayerImpl.java
View file

@ -1342,11 +1342,7 @@ public abstract class PlayerImpl implements Player, Serializable {
}
}
}
UUID sourceId = object.getId();
if (object instanceof SplitCardHalf) {
sourceId = ((SplitCardHalf) object).getParentCard().getId();
}
if (zone != Zone.BATTLEFIELD && game.getContinuousEffects().asThough(sourceId, AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, playerId, game)) {
if (zone != Zone.BATTLEFIELD && game.getContinuousEffects().asThough(object.getId(), AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, this.getId(), game)) {
for (Ability ability : candidateAbilites) {
if (canUse || ability.getAbilityType() == AbilityType.SPECIAL_ACTION) {
ability.setControllerId(this.getId());