Merge pull request #24 from WagicProject/master

getting master
2016-07-18 17:23:54 -04:00
parent bfaaf7d893 322e6f7edf
commit 520be9dbe8
23 changed files with 195 additions and 73 deletions
@@ -2633,6 +2633,11 @@ public:
    {
        if(!nonstatic)
            return;
+        if(source->isToken && !source->isInPlay(game) && cda)
+        {
+            this->forceDestroy = 1;
+            return;
+        }
        if(!cda || (cda && (((MTGCardInstance *) target)->isSettingBase < 1)))
        {
            if(((MTGCardInstance *) target)->isSwitchedPT)