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

Merge remote-tracking branch 'refs/remotes/WagicProject/master'

Browse Source
This commit is contained in:
Anthony Calosa
2016-07-29 07:00:07 +08:00
parent c2cec37928 047d08882e
commit a7dc44e4e1
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
projects/mtg/include/AllAbilities.h
View File

@@ -1370,12 +1370,11 @@ public:
{ {
WEventCardSacrifice * e = dynamic_cast<WEventCardSacrifice *> (event); WEventCardSacrifice * e = dynamic_cast<WEventCardSacrifice *> (event);
if (!e) return 0; if (!e) return 0;
if (e->istoken)
tc->setAllZones();
MTGCardInstance * check = e->cardAfter; MTGCardInstance * check = e->cardAfter;
MTGGameZone * oldZone = e->cardAfter->currentZone; MTGGameZone * oldZone = e->cardAfter->currentZone;
MTGGameZone * currZone = check->currentZone;
check->currentZone = check->previousZone; check->currentZone = check->previousZone;
if (check->next && check->next->currentZone) if (check->next && (check->next->currentZone|| check->isToken))
{ {
check = e->cardAfter->next; check = e->cardAfter->next;
oldZone = e->cardAfter->next->currentZone; oldZone = e->cardAfter->next->currentZone;