From 5ed51be2c22ecf9a5ee1d32b003616b1af39f0c3 Mon Sep 17 00:00:00 2001 From: Agetian Date: Sat, 19 Sep 2015 07:39:00 +0000 Subject: [PATCH] - NPE prevention in PumpAiBase. --- forge-ai/src/main/java/forge/ai/ability/PumpAiBase.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/forge-ai/src/main/java/forge/ai/ability/PumpAiBase.java b/forge-ai/src/main/java/forge/ai/ability/PumpAiBase.java index ade28e04c6a..3ccf0b44c41 100644 --- a/forge-ai/src/main/java/forge/ai/ability/PumpAiBase.java +++ b/forge-ai/src/main/java/forge/ai/ability/PumpAiBase.java @@ -88,6 +88,9 @@ public abstract class PumpAiBase extends SpellAbilityAi { List attackers = CardLists.filter(ai.getCardsIn(ZoneType.Battlefield), new Predicate() { @Override public boolean apply(final Card c) { + if (combat == null) { + return false; + } if (c.equals(sa.getHostCard()) && sa.getPayCosts() != null && sa.getPayCosts().hasTapCost() && !combat.isAttacking(c)) { return false;