fix created cards being considered for deck detection (HearthSim#1815)

revert 20d89f3
thedudend · Dec 8, 2015 · 69b163d · 69b163d
1 parent 9123c84
commit 69b163d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Hearthstone Deck Tracker/Hearthstone/Player.cs b/Hearthstone Deck Tracker/Hearthstone/Player.cs
@@ -261,7 +261,7 @@ public void Draw(Entity entity, int turn)
 			else
 				ce.Reset();
 
-			if(!string.IsNullOrEmpty(entity.CardId) && ce.CardMark != CardMark.Created && ce.CardMark != CardMark.Returned)
+			if(!string.IsNullOrEmpty(entity.CardId) && ce.CardMark != CardMark.Created && ce.CardMark != CardMark.Returned && !ce.Created)
 			{
 				if(IsLocalPlayer && !CardMatchesActiveDeck(entity.CardId))
 					DrawnCardsMatchDeck = false;

diff --git a/Hearthstone Deck Tracker/LogReader/Handlers/TagChangeHandler.cs b/Hearthstone Deck Tracker/LogReader/Handlers/TagChangeHandler.cs
@@ -497,7 +497,7 @@ public void TagChange(IHsGameState gameState, string rawTag, int id, string rawV
 						gameState.GameHandler.HandleOpponentStolen(game.Entities[id], cardId, gameState.GetTurnNumber());
 						gameState.ProposeKeyPoint(KeyPointType.SecretStolen, id, ActivePlayer.Player);
 		            }
-		            else if (game.Entities[id].IsInZone(TAG_ZONE.PLAY) || game.Entities[id].IsInZone(TAG_ZONE.DECK))
+		            else if (game.Entities[id].IsInZone(TAG_ZONE.PLAY))
 						gameState.GameHandler.HandleOpponentStolen(game.Entities[id], cardId, gameState.GetTurnNumber());
 				}
 	            else if (value == game.Opponent.Id)
@@ -507,7 +507,7 @@ public void TagChange(IHsGameState gameState, string rawTag, int id, string rawV
 						gameState.GameHandler.HandleOpponentStolen(game.Entities[id], cardId, gameState.GetTurnNumber());
 						gameState.ProposeKeyPoint(KeyPointType.SecretStolen, id, ActivePlayer.Player);
 		            }
-					else if (game.Entities[id].IsInZone(TAG_ZONE.PLAY) || game.Entities[id].IsInZone(TAG_ZONE.DECK))
+					else if (game.Entities[id].IsInZone(TAG_ZONE.PLAY))
 						gameState.GameHandler.HandlePlayerStolen(game.Entities[id], cardId, gameState.GetTurnNumber());
 	            }
             }