From 34a91b7e3d74c80228c88fe6dd3c862f8b751191 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Fri, 26 Mar 2021 22:33:23 +0100 Subject: [PATCH] Fix NPE --- forge-ai/src/main/java/forge/ai/AiController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/AiController.java b/forge-ai/src/main/java/forge/ai/AiController.java index 976989da429..878bc7c1c65 100644 --- a/forge-ai/src/main/java/forge/ai/AiController.java +++ b/forge-ai/src/main/java/forge/ai/AiController.java @@ -1102,8 +1102,6 @@ public class AiController { } public CardCollection getCardsToDiscard(int min, final int max, final CardCollection validCards, final SpellAbility sa) { - String logic = sa.getParamOrDefault("AILogic", ""); - if (validCards.size() < min) { return null; } @@ -1112,6 +1110,7 @@ public class AiController { final CardCollection discardList = new CardCollection(); int count = 0; if (sa != null) { + String logic = sa.getParamOrDefault("AILogic", ""); sourceCard = sa.getHostCard(); if ("Always".equals(logic) && !validCards.isEmpty()) { min = 1;