From fb4ac61919e8d127a1bac5f2a63e5a0f13f8a9d6 Mon Sep 17 00:00:00 2001 From: Sol Date: Thu, 4 Sep 2014 03:10:01 +0000 Subject: [PATCH] - Combat.getBandOfAttacker() should only return from lkiCache if the card found in the cache actually was attacking --- forge-game/src/main/java/forge/game/combat/Combat.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7308a8137ec..34ba2b70a82 100644 --- a/forge-game/src/main/java/forge/game/combat/Combat.java +++ b/forge-game/src/main/java/forge/game/combat/Combat.java @@ -172,7 +172,7 @@ public class Combat { return ab; } CombatLki lki = lkiCache.get(c); - return lki == null ? null : lki.getFirstBand(); + return lki == null || lki.isAttacker ? null : lki.getFirstBand(); } public final List getAttackingBands() {