From bac3b7751da6bbde264889d1c62b5a63c678a633 Mon Sep 17 00:00:00 2001 From: Agetian Date: Wed, 5 Jul 2023 20:30:54 +0300 Subject: [PATCH] - Restore the NPE guard for bestAttacker --- forge-ai/src/main/java/forge/ai/AiAttackController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-ai/src/main/java/forge/ai/AiAttackController.java b/forge-ai/src/main/java/forge/ai/AiAttackController.java index 69d71872120..7faac65a862 100644 --- a/forge-ai/src/main/java/forge/ai/AiAttackController.java +++ b/forge-ai/src/main/java/forge/ai/AiAttackController.java @@ -570,7 +570,7 @@ public class AiAttackController { bestBand = ComputerUtilCard.getBestCreatureAI(CardLists.getType(attackers, "Dinosaur")); } else if (c.hasKeyword("Bands with Other Creatures named Wolves of the Hunt")) { bestBand = ComputerUtilCard.getBestCreatureAI(CardLists.filter(attackers, CardPredicates.nameEquals("Wolves of the Hunt"))); - } else if (!c.hasAnyKeyword(evasionKeywords) && bestAttacker.hasAnyKeyword(evasionKeywords)) { + } else if (!c.hasAnyKeyword(evasionKeywords) && bestAttacker != null && bestAttacker.hasAnyKeyword(evasionKeywords)) { bestBand = ComputerUtilCard.getBestCreatureAI(CardLists.filter(attackers, card -> !card.hasAnyKeyword(evasionKeywords))); } else { bestBand = bestAttacker;