Still handle secret played even without block cardid (HearthSim#4313)

bitzhjr · Jun 28, 2021 · ab5188c · ab5188c
1 parent 5093543
commit ab5188c
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/Hearthstone Deck Tracker/LogReader/Handlers/TagChangeActions.cs b/Hearthstone Deck Tracker/LogReader/Handlers/TagChangeActions.cs
@@ -473,6 +473,7 @@ private void ZoneChangeFromOther(IHsGameState gameState, int id, IGame game, int
 		{
 			if(!game.Entities.TryGetValue(id, out var entity))
 				return;
+			var currentBlockCardId = gameState.CurrentBlock?.CardId ?? "";
 			if(entity.Info.OriginalZone == DECK && value != (int)DECK)
 			{
 				//This entity was moved from DECK to SETASIDE to HAND, e.g. by Tracking
@@ -510,8 +511,8 @@ private void ZoneChangeFromOther(IHsGameState gameState, int id, IGame game, int
 						gameState.GameHandler.HandleOpponentGet(entity, gameState.GetTurnNumber(), id);
 					break;
 				case Zone.SECRET:
-					if(controller == game.Player.Id && gameState.CurrentBlock?.Parent != null)
-						gameState.GameHandler.HandlePlayerSecretPlayed(entity, cardId, gameState.GetTurnNumber(), (Zone)prevValue, gameState.CurrentBlock.Parent.CardId);
+					if(controller == game.Player.Id)
+						gameState.GameHandler.HandlePlayerSecretPlayed(entity, cardId, gameState.GetTurnNumber(), (Zone)prevValue, currentBlockCardId);
 					else if(controller == game.Opponent.Id)
 						gameState.GameHandler.HandleOpponentSecretPlayed(entity, cardId, -1, gameState.GetTurnNumber(), (Zone)prevValue, id);
 					break;
@@ -594,11 +595,12 @@ private void ZoneChangeFromHand(IHsGameState gameState, int id, IGame game, int
 		{
 			if(!game.Entities.TryGetValue(id, out var entity))
 				return;
+			var currentBlockCardId = gameState.CurrentBlock?.CardId ?? "";
 			switch((Zone)value)
 			{
 				case PLAY:
-					if(controller == game.Player.Id && gameState.CurrentBlock?.Parent != null)
-						gameState.GameHandler.HandlePlayerPlay(entity, cardId, gameState.GetTurnNumber(), gameState.CurrentBlock.Parent.CardId);
+					if(controller == game.Player.Id)
+						gameState.GameHandler.HandlePlayerPlay(entity, cardId, gameState.GetTurnNumber(), currentBlockCardId);
 					else if(controller == game.Opponent.Id)
 					{
 						gameState.GameHandler.HandleOpponentPlay(entity, cardId, entity.GetTag(ZONE_POSITION),
@@ -618,7 +620,7 @@ private void ZoneChangeFromHand(IHsGameState gameState, int id, IGame game, int
 					break;
 				case Zone.SECRET:
 					if(controller == game.Player.Id && gameState.CurrentBlock?.Parent != null)
-							gameState.GameHandler.HandlePlayerSecretPlayed(entity, cardId, gameState.GetTurnNumber(), (Zone)prevValue, gameState.CurrentBlock.Parent.CardId);
+							gameState.GameHandler.HandlePlayerSecretPlayed(entity, cardId, gameState.GetTurnNumber(), (Zone)prevValue, currentBlockCardId);
 					else if(controller == game.Opponent.Id)
 					{
 						gameState.GameHandler.HandleOpponentSecretPlayed(entity, cardId, entity.GetTag(ZONE_POSITION),
@@ -641,6 +643,7 @@ private void ZoneChangeFromDeck(IHsGameState gameState, int id, IGame game, int
 		{
 			if(!game.Entities.TryGetValue(id, out var entity))
 				return;
+			var currentBlockCardId = gameState.CurrentBlock?.CardId ?? "";
 			switch((Zone)value)
 			{
 				case HAND:
@@ -711,8 +714,8 @@ private void ZoneChangeFromDeck(IHsGameState gameState, int id, IGame game, int
 						gameState.GameHandler.HandleOpponentDeckToPlay(entity, cardId, gameState.GetTurnNumber());
 					break;
 				case Zone.SECRET:
-					if(controller == game.Player.Id && gameState.CurrentBlock?.Parent != null)
-						gameState.GameHandler.HandlePlayerSecretPlayed(entity, cardId, gameState.GetTurnNumber(), (Zone)prevValue, gameState.CurrentBlock.Parent.CardId);
+					if(controller == game.Player.Id)
+						gameState.GameHandler.HandlePlayerSecretPlayed(entity, cardId, gameState.GetTurnNumber(), (Zone)prevValue, currentBlockCardId);
 					else if(controller == game.Opponent.Id)
 						gameState.GameHandler.HandleOpponentSecretPlayed(entity, cardId, -1, gameState.GetTurnNumber(), (Zone)prevValue, id);
 					break;