external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'assorted-fixes' into 'master'

Browse Source 
- Indirect aura attachment: fix Sovereigns of Lost Alara not attaching Cartouches

See merge request core-developers/forge!164
This commit is contained in:
Hans Mackowiak
2018-01-31 06:01:00 +00:00
parent 7696b9d69c 32facbbc74
commit 1582f5a7bd
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
View File

@@ -1228,8 +1228,13 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
final Game game = source.getGame();
final TargetRestrictions tgt = attachEff.getTargetRestrictions();
Player attachEffCtrl = attachEff.getActivatingPlayer();
if (attachEffCtrl == null && attachEff.getHostCard() != null) {
attachEffCtrl = attachEff.getHostCard().getController();
}
CardCollectionView list = game.getCardsIn(tgt.getZone());
list = CardLists.getValidCards(list, tgt.getValidTgts(), attachEff.getActivatingPlayer(), source, attachEff);
list = CardLists.getValidCards(list, tgt.getValidTgts(), attachEffCtrl, source, attachEff);
return list.contains(target);
}
}