Fix (#199)

IceYGO · Jul 26, 2024 · 721a833 · 721a833
1 parent 11169f2
commit 721a833
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Game/AI/DefaultExecutor.cs b/Game/AI/DefaultExecutor.cs
@@ -1579,7 +1579,7 @@ protected bool DefaultCheckWhetherCardIsNegated(ClientCard card)
             if (originId == 0) originId = card.Data.Id;
             return crossoutDesignatorIdList.Contains(originId)
                 || (calledbytheGraveIdCountMap.ContainsKey(originId) && calledbytheGraveIdCountMap[originId] > 0)
-                || card.IsDisabled();
+                || (card.IsDisabled() && ((int)card.Location & (int)CardLocation.Onfield) > 0);
         }
 
         protected bool DefaultCheckWhetherCardIdIsNegated(int cardId)

diff --git a/Game/GameAI.cs b/Game/GameAI.cs
@@ -1162,14 +1162,14 @@ public BattlePhaseAction ToMainPhase2()
 
         private bool ShouldExecute(CardExecutor exec, ClientCard card, ExecutorType type, int desc = -1, int timing = -1)
         {
+            Executor.SetCard(type, card, desc, timing);
             if (card.Id != 0 && type == ExecutorType.Activate)
             {
                 if (_activatedCards.ContainsKey(card.Id) && _activatedCards[card.Id] >= 9)
                     return false;
                 if (!Executor.OnPreActivate(card))
                     return false;
             }
-            Executor.SetCard(type, card, desc, timing);
             bool result = card != null && exec.Type == type &&
                 (exec.CardId == -1 || exec.CardId == card.Id) &&
                 (exec.Func == null || exec.Func());

diff --git a/Game/GameBehavior.cs b/Game/GameBehavior.cs
@@ -1024,7 +1024,7 @@ private void InternalOnSelectCard(BinaryReader packet, Func<IList<ClientCard>, i
                     card.Controller = player;
                 }
                 if (card == null) continue;
-                if (card.Id == 0)
+                if (card.Id == 0 || card.Location == CardLocation.Deck)
                     card.SetId(id);
                 cards.Add(card);
             }