From 6dfec391439151ab0f47fea0bf97d5dcacca39b8 Mon Sep 17 00:00:00 2001 From: Sol Date: Sun, 22 Nov 2015 20:51:25 +0000 Subject: [PATCH] - Some NPE protection for getAttackingBands --- forge-game/src/main/java/forge/game/combat/Combat.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/forge-game/src/main/java/forge/game/combat/Combat.java b/forge-game/src/main/java/forge/game/combat/Combat.java index f3e46a9a52c..5b4653c4723 100644 --- a/forge-game/src/main/java/forge/game/combat/Combat.java +++ b/forge-game/src/main/java/forge/game/combat/Combat.java @@ -159,6 +159,8 @@ public class Combat { public final CardCollection getAttackersOf(GameEntity defender) { CardCollection result = new CardCollection(); + if (!attackedByBands.containsKey(defender)) + return result; for (AttackingBand v : attackedByBands.get(defender)) { result.addAll(v.getAttackers()); }