From 7620b42bef96d061fd57fb5e8fe9ab7700b31d7c Mon Sep 17 00:00:00 2001 From: Sloth Date: Sun, 30 Jun 2013 08:25:21 +0000 Subject: [PATCH] - Fixed NPE in getAttackersOf. --- src/main/java/forge/game/combat/Combat.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/forge/game/combat/Combat.java b/src/main/java/forge/game/combat/Combat.java index c8e448f7ea0..a398a849dfa 100644 --- a/src/main/java/forge/game/combat/Combat.java +++ b/src/main/java/forge/game/combat/Combat.java @@ -97,6 +97,9 @@ public class Combat { public final List getAttackersOf(GameEntity defender) { List result = new ArrayList(); + if (!attackedEntities.containsKey(defender)) { + return result; + } for(AttackingBand v : attackedEntities.get(defender)) { result.addAll(v.getAttackers()); }