external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

LKI for defenders (part 2 - final). Abu Ja'far now works as intended

Browse Source
This commit is contained in:
Maxmtg
2013-06-25 20:26:40 +00:00
parent cf3dac5a7d
commit 2717c0d494
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/forge/game/combat/Combat.java
View File

@@ -641,6 +641,10 @@ public class Combat {
} }
public boolean isBlocking(Card blocker) { public boolean isBlocking(Card blocker) {
if ( !blocker.isInPlay() ) {
CombatLki lki = lkiCache.get(blocker);
return null != lki && !lki.isAttacker; // was blocking something anyway
}
for (Collection<Card> blockers : blockedBands.values()) for (Collection<Card> blockers : blockedBands.values())
if (blockers.contains(blocker)) if (blockers.contains(blocker))
return true; return true;
@@ -649,6 +653,10 @@ public class Combat {
public boolean isBlocking(Card blocker, Card attacker) { public boolean isBlocking(Card blocker, Card attacker) {
AttackingBand ab = getBandOfAttacker(attacker); AttackingBand ab = getBandOfAttacker(attacker);
if ( !blocker.isInPlay() ) {
CombatLki lki = lkiCache.get(blocker);
return null != lki && !lki.isAttacker && lki.relatedBands.contains(ab); // was blocking that very band
}
Collection<Card> blockers = blockedBands.get(ab); Collection<Card> blockers = blockedBands.get(ab);
return blockers != null && blockers.contains(blocker); return blockers != null && blockers.contains(blocker);
} }