Fixed primitives, fixed alias 1117 and fixed the bug on lastCardDrawn from library.

2020-09-21 17:56:20 +02:00
parent 495e5f1429
commit c4ba879382
4 changed files with 39 additions and 15 deletions
@@ -242,7 +242,6 @@ void MTGPlayerCards::drawFromLibrary()
        return;
    }
    MTGCardInstance * toMove = library->cards[library->nb_cards - 1];
-    library->lastCardDrawn = toMove;
    if (!library->miracle)
    {
        library->miracle = true;
@@ -270,9 +269,12 @@ void MTGPlayerCards::drawFromLibrary()
        }
    }

-    if(putInZone(toMove, library, hand))
+    MTGCardInstance * ret = putInZone(toMove, library, hand);
+    if(ret)
    {
        toMove->currentZone = hand;
+        ret->currentZone = hand;
+        library->lastCardDrawn = ret;
    }
 }