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()); }