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

fixed copies of Approach of the Second Sun not working correctly

Browse source
This commit is contained in:
Evan Kranzler 2017-09-26 17:52:17 -04:00
parent d2d6231ab3
commit f7931692ab
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage.Sets/src/mage/cards/a/ApproachOfTheSecondSun.java
View file

@ -63,7 +63,10 @@ class ApproachOfTheSecondSunEffect extends OneShotEffect {
if (controller != null && spell != null) {
ApproachOfTheSecondSunWatcher watcher
= (ApproachOfTheSecondSunWatcher) game.getState().getWatchers().get(ApproachOfTheSecondSunWatcher.class.getSimpleName());
if (watcher != null && watcher.getApproachesCast(controller.getId()) > 1 && spell.getFromZone() == Zone.HAND) {
if (watcher != null
&& !spell.isCopiedSpell()
&& watcher.getApproachesCast(controller.getId()) > 1
&& spell.getFromZone() == Zone.HAND) {
// Win the game
controller.won(game);
} else {
@ -71,6 +74,9 @@ class ApproachOfTheSecondSunEffect extends OneShotEffect {
controller.gainLife(7, game);
// Put this into the library as the 7th from the top
if (spell.isCopiedSpell()) {
return true;
}
Card spellCard = game.getStack().getSpell(source.getSourceId()).getCard();
if (spellCard != null) {
List<Card> top6 = new ArrayList<>();