From 582f9497913ce37f5ade39b63f5e3867e80d15e4 Mon Sep 17 00:00:00 2001 From: Agetian Date: Mon, 12 Jun 2023 18:56:18 +0300 Subject: [PATCH] - Simplify source lookup --- forge-ai/src/main/java/forge/ai/AiCostDecision.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/AiCostDecision.java b/forge-ai/src/main/java/forge/ai/AiCostDecision.java index 960d39aa9e8..fa708e1b5f7 100644 --- a/forge-ai/src/main/java/forge/ai/AiCostDecision.java +++ b/forge-ai/src/main/java/forge/ai/AiCostDecision.java @@ -472,16 +472,14 @@ public class AiCostDecision extends CostDecisionMakerBase { if (cost.getRevealFrom().size() == 2 && cost.getRevealFrom().containsAll(Arrays.asList(ZoneType.Hand, ZoneType.Battlefield))) { // RevealOrChoose String aiLogic = ability.getParamOrDefault("AILogic", ""); - CardCollection battlefieldOrHand = CardLists.getValidCards(player.getCardsIn(ZoneType.Battlefield), - type.split(";"), player, source, ability); - battlefieldOrHand.addAll(CardLists.getValidCards(hand, type.split(";"), player, source, ability)); + hand = CardLists.getValidCards(hand, type.split(";"), player, source, ability); if (aiLogic.startsWith("PowerAtLeast.")) { int minPower = Integer.parseInt(aiLogic.substring(aiLogic.indexOf(".") + 1)); - battlefieldOrHand = CardLists.filterPower(battlefieldOrHand, minPower); + hand = CardLists.filterPower(hand, minPower); } - return battlefieldOrHand.isEmpty() ? null : PaymentDecision.card(getBestCreatureAI(battlefieldOrHand)); + return hand.isEmpty() ? null : PaymentDecision.card(getBestCreatureAI(hand)); } if (cost.getType().equals("SameColor")) {