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

Combat: use lkiCase only if blocker itself is an lki

Browse Source
This commit is contained in:
Hans Mackowiak
2020-03-08 11:00:14 +01:00
parent d5b578b306
commit e1659a4539
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-game/src/main/java/forge/game/combat/Combat.java
View File

@@ -882,6 +882,10 @@ public class Combat {
return true; // is blocking something at the moment return true; // is blocking something at the moment
} }
if (!blocker.isLKI()) {
return false;
}
CombatLki lki = lkiCache.get(blocker); CombatLki lki = lkiCache.get(blocker);
return null != lki && !lki.isAttacker; // was blocking something anyway return null != lki && !lki.isAttacker; // was blocking something anyway
} }
@@ -892,7 +896,11 @@ public class Combat {
if (blockers != null && blockers.contains(blocker)) { if (blockers != null && blockers.contains(blocker)) {
return true; // is blocking the attacker's band at the moment return true; // is blocking the attacker's band at the moment
} }
if (!blocker.isLKI()) {
return false;
}
CombatLki lki = lkiCache.get(blocker); CombatLki lki = lkiCache.get(blocker);
return null != lki && !lki.isAttacker && lki.relatedBands.contains(ab); // was blocking that very band return null != lki && !lki.isAttacker && lki.relatedBands.contains(ab); // was blocking that very band
} }