Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #820 from kevlahnota/master

Browse Source 
Fix Cloner
This commit is contained in:
Anthony Calosa
2016-07-31 21:38:10 +08:00
committed by GitHub
parent f0909ba3a0 3b98da1d86
commit 0efc6338bb
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
projects/mtg/src/AllAbilities.cpp
View File

@@ -3936,7 +3936,12 @@ int AACloner::resolve()
spell->source->addType(*it);
}
spell->source->modifiedbAbi = _target->modifiedbAbi;
spell->source->basicAbilities = _target->origbasicAbilities;
//spell->source->basicAbilities = _target->origbasicAbilities;
for(int k = 0; k < Constants::NB_BASIC_ABILITIES; k++)
{
if(_target->model->data->basicAbilities[k])
spell->source->basicAbilities[k] = _target->model->data->basicAbilities[k];
}
delete spell;
}
return 1;

2
projects/mtg/src/MTGGameZones.cpp
View File

@@ -435,7 +435,7 @@ MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone
if (from == g->players[0]->game->battlefield || from == g->players[1]->game->battlefield)
{
if(to != g->players[0]->game->battlefield || to != g->players[1]->game->battlefield)
if (copy->previous && copy->previous->MeldedFrom.size())
if (copy->previous && copy->previous->MeldedFrom.size() && !copy->isACopier && !copy->isToken)//!copier & !token fix kiki-jiki clones crash
{
vector<string> names = split(copy->previous->MeldedFrom, '|');
MTGCard * cardone = MTGCollection()->getCardByName(names[0]);