From 15a8437d794cff13c8e3968ead92ad40e4c9cbab Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Sun, 21 Aug 2016 11:28:17 +0800 Subject: [PATCH] check imprinted card fix crash --- projects/mtg/src/AllAbilities.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/projects/mtg/src/AllAbilities.cpp b/projects/mtg/src/AllAbilities.cpp index 46c2d9e51..3bcc6f96a 100644 --- a/projects/mtg/src/AllAbilities.cpp +++ b/projects/mtg/src/AllAbilities.cpp @@ -7576,6 +7576,12 @@ void AACastCard::Update(float dt) } } theNamedCard = makeCard(); + //if somehow the imprinted card leaves its zone destroy this... + if(cardNamed.find("imprintedcard") != string::npos && !theNamedCard) + { + this->forceDestroy = 1; + return; + } } if(putinplay) { @@ -7669,6 +7675,7 @@ MTGCardInstance * AACastCard::makeCard() { MTGCardInstance * card = NULL; MTGCard * cardData = MTGCollection()->getCardByName(cardNamed); + if(!cardData) return NULL; card = NEW MTGCardInstance(cardData, source->controller()->game); card->owner = source->controller(); source->controller()->game->temp->addCard(card);