Merge branch 'master' of https://github.com/IceYGO/windbot

Game/Duel.cs

@@ -115,10 +115,11 @@ namespace WindBot.Game
             }
         }
 
-        public void AddCard(CardLocation loc, ClientCard card, int player, int zone, int pos)
+        public void AddCard(CardLocation loc, ClientCard card, int player, int zone, int pos, int id)
         {
             card.Location = loc;
             card.Position = pos;
+            card.SetId(id);
             switch (loc)
             {
                 case CardLocation.Hand:

Game/GameBehavior.cs

@@ -474,6 +474,7 @@ namespace WindBot.Game
                 card = _duel.GetCard(previousControler, (CardLocation)previousLocation, previousSequence);
                 if (card != null)
                     card.Overlays.Remove(cardId);
+                previousLocation = 0; // the card is removed when it go to overlay, so here we treat it as a new card
             }
             else
                 _duel.RemoveCard((CardLocation)previousLocation, card, previousControler, previousSequence);
@@ -490,7 +491,9 @@ namespace WindBot.Game
                 if (previousLocation == 0)
                     _duel.AddCard((CardLocation)currentLocation, cardId, currentControler, currentSequence, currentPosition);
                 else
-                    _duel.AddCard((CardLocation)currentLocation, card, currentControler, currentSequence, currentPosition);
+                {
+                    _duel.AddCard((CardLocation)currentLocation, card, currentControler, currentSequence, currentPosition, cardId);
+                }
             }
         }