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

- Fixed a possible infinite loop caused by creatures with "can't attack alone" and "must attack if able".

Browse Source
This commit is contained in:
Sloth
2015-07-14 22:07:30 +00:00
parent 03c49d48d4
commit 4ad634b57e
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-ai/src/main/java/forge/ai/AiController.java
View File

@@ -1138,6 +1138,9 @@ public class AiController {
for (final Map.Entry<Card, GameEntity> mandatoryAttacker : legal.entrySet()) { for (final Map.Entry<Card, GameEntity> mandatoryAttacker : legal.entrySet()) {
combat.addAttacker(mandatoryAttacker.getKey(), mandatoryAttacker.getValue()); combat.addAttacker(mandatoryAttacker.getKey(), mandatoryAttacker.getValue());
} }
if (!CombatUtil.validateAttackers(combat)) {
aiAtk.declareAttackers(combat);
}
} }
for (final Card element : combat.getAttackers()) { for (final Card element : combat.getAttackers()) {

2
forge-game/src/main/java/forge/game/combat/AttackConstraints.java
View File

@@ -298,6 +298,8 @@ public class AttackConstraints {
final int previousNeeded = attackersNeeded; final int previousNeeded = attackersNeeded;
attackersNeeded = Ints.max(3 - (myAttackers.size() + reserved.size()), 0); attackersNeeded = Ints.max(3 - (myAttackers.size() + reserved.size()), 0);
localMaximum -= Ints.max(attackersNeeded - previousNeeded, 0); localMaximum -= Ints.max(attackersNeeded - previousNeeded, 0);
} else if (restrictions.get(req.attacker).getTypes().contains(AttackRestrictionType.NOT_ALONE)) {
attackersNeeded = Ints.max(2 - (myAttackers.size() + reserved.size()), 0);
} }
} }