From 516089869d18335c8350f4cdfa79641dda98190e Mon Sep 17 00:00:00 2001 From: "omegablast2002@yahoo.com" Date: Mon, 10 Oct 2011 14:09:04 +0000 Subject: [PATCH] phased cards shouldn't be removed from the game by treason or the effects of unearth if they we're phased out by an effect during the turn in which they were to be destroyed. --- projects/mtg/src/GameObserver.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/projects/mtg/src/GameObserver.cpp b/projects/mtg/src/GameObserver.cpp index ffd6d65cd..4364a1743 100644 --- a/projects/mtg/src/GameObserver.cpp +++ b/projects/mtg/src/GameObserver.cpp @@ -575,17 +575,20 @@ void GameObserver::gameStateBasedEffects() { MTGCardInstance * c = z->cards[t]; - if (c->has(Constants::TREASON)) + if(!c->isPhased) { - WEvent * e = NEW WEventCardSacrifice(c); - receiveEvent(e); + if (c->has(Constants::TREASON)) + { + WEvent * e = NEW WEventCardSacrifice(c); + receiveEvent(e); - p->game->putInGraveyard(c); - } - if (c->has(Constants::UNEARTH)) - { - p->game->putInExile(c); + p->game->putInGraveyard(c); + } + if (c->has(Constants::UNEARTH)) + { + p->game->putInExile(c); + } } if(nbcards > z->nb_cards) {