From 36f31656881eda224aee4706426c9abe6322325a Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Sun, 13 Jun 2021 23:18:29 +0200 Subject: [PATCH] Fix NPE --- forge-ai/src/main/java/forge/ai/AiAttackController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/AiAttackController.java b/forge-ai/src/main/java/forge/ai/AiAttackController.java index 92000c1f6ae..a0dd1b7bbbc 100644 --- a/forge-ai/src/main/java/forge/ai/AiAttackController.java +++ b/forge-ai/src/main/java/forge/ai/AiAttackController.java @@ -661,7 +661,8 @@ public class AiAttackController { // 2. attack planeswalkers List pwDefending = c.getDefendingPlaneswalkers(); if (!pwDefending.isEmpty()) { - return ComputerUtilCard.getBestPlaneswalkerToDamage(pwDefending); + final Card pwNearUlti = ComputerUtilCard.getBestPlaneswalkerToDamage(pwDefending); + return pwNearUlti != null ? pwNearUlti : ComputerUtilCard.getBestPlaneswalkerAI(pwDefending); } else { return prefDefender; } @@ -1102,7 +1103,8 @@ public class AiAttackController { defender = Collections.min(Lists.newArrayList(combat.getDefendingPlayers()), PlayerPredicates.compareByLife()); } else { - defender = ComputerUtilCard.getBestPlaneswalkerToDamage(pwDefending); + final Card pwNearUlti = ComputerUtilCard.getBestPlaneswalkerToDamage(pwDefending); + defender = pwNearUlti != null ? pwNearUlti : ComputerUtilCard.getBestPlaneswalkerAI(pwDefending); } } }