diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt index 0d5ff3570..b6fbf7e88 100644 --- a/projects/mtg/bin/Res/test/_tests.txt +++ b/projects/mtg/bin/Res/test/_tests.txt @@ -128,6 +128,7 @@ dragon_fodder.txt dragon_fodder2.txt dragon_whelp_i154.txt drain_life.txt +dream_fracture_i142.txt drift_of_the_dead.txt dromad_purebred.txt dross_harvester.txt diff --git a/projects/mtg/bin/Res/test/bugs/dream_fracture_i142.txt b/projects/mtg/bin/Res/test/dream_fracture_i142.txt similarity index 86% rename from projects/mtg/bin/Res/test/bugs/dream_fracture_i142.txt rename to projects/mtg/bin/Res/test/dream_fracture_i142.txt index f9e078365..d61a26376 100644 --- a/projects/mtg/bin/Res/test/bugs/dream_fracture_i142.txt +++ b/projects/mtg/bin/Res/test/dream_fracture_i142.txt @@ -25,11 +25,11 @@ endinterruption [ASSERT] firstmain [PLAYER1] -hand:Forest +library:Forest graveyard:Grizzly Bears -library:Craw Wurm +hand:Craw Wurm [PLAYER2] -hand:Swamp +library:Swamp graveyard:Dream Fracture -library:Air Elemental +hand:Air Elemental [END] diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index 9d92bad72..d4d78e6ca 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -2263,7 +2263,16 @@ AManaProducer::AManaProducer(int id, MTGCardInstance * card, Targetable * t, Man Targetable * ActivatedAbilityTP::getTarget(){ switch(who){ case TargetChooser::TARGET_CONTROLLER: - if (target) return ((MTGCardInstance *)target)->controller(); + if (target){ + switch(target->typeAsTarget()) { + case TARGET_CARD: + return ((MTGCardInstance *)target)->controller(); + case TARGET_STACKACTION: + return((Interruptible *)target)->source->controller(); + default: + return (Player *)target; + } + } return NULL; case TargetChooser::CONTROLLER: return source->controller();