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

Fix workaround

Browse Source
This commit is contained in:
tool4EvEr
2021-05-21 08:43:36 +02:00
parent e5d588c4eb
commit e5df3b9cb3
6 changed files with 22 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
forge-game/src/main/java/forge/game/combat/CombatUtil.java
View File

@@ -1079,7 +1079,10 @@ public class CombatUtil {
} // canBlock()
public static boolean canAttackerBeBlockedWithAmount(Card attacker, int amount, Combat combat) {
if( amount == 0 )
return canAttackerBeBlockedWithAmount(attacker, amount, combat != null ? combat.getDefenderPlayerByAttacker(attacker) : null);
}
public static boolean canAttackerBeBlockedWithAmount(Card attacker, int amount, Player defender) {
if(amount == 0 )
return false; // no block
List<String> restrictions = Lists.newArrayList();
@@ -1098,18 +1101,7 @@ public class CombatUtil {
if (Expressions.compare(amount, operator, operand) )
return false;
}
if (combat != null && attacker.hasKeyword("CARDNAME can't be blocked " +
"unless all creatures defending player controls block it.")) {
Player defender = combat.getDefenderPlayerByAttacker(attacker);
if (defender == null) {
// TODO: a better fix is needed here (to prevent a hard NPE, e.g. when the AI attacks with Tromokratis).
System.out.println("Warning: defender was 'null' in CombatUtil::canAttackerBeBlockedWithAmount for the card " + attacker + ", attempting to deduce defender.");
defender = combat.getDefendingPlayers().getFirst();
if (defender == null) {
System.out.println("Warning: it was impossible to deduce the defending player in CombatUtil#canAttackerBeBlockedWithAmount, returning 'true' (safest default).");
return true;
}
}
if (defender != null && attacker.hasKeyword("CARDNAME can't be blocked unless all creatures defending player controls block it.")) {
return amount >= defender.getCreaturesInPlay().size();
}