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

Better fix for that concurrent modification exception. Don't know what I was thinking.

Browse Source
This commit is contained in:
Krazy
2015-05-25 03:35:40 +00:00
parent 7f060a0b1f
commit 5a4959e59d
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
forge-ai/src/main/java/forge/ai/AiBlockController.java
View File

@@ -29,9 +29,7 @@ import forge.game.trigger.Trigger;
import forge.game.trigger.TriggerType; import forge.game.trigger.TriggerType;
import forge.util.FCollectionView; import forge.util.FCollectionView;
import java.util.ArrayList; import java.util.*;
import java.util.List;
import java.util.Map;
/** /**
@@ -117,14 +115,17 @@ public class AiBlockController {
ComputerUtilCard.sortByEvaluateCreature(attackers); ComputerUtilCard.sortByEvaluateCreature(attackers);
CardLists.sortByPowerDesc(attackers); CardLists.sortByPowerDesc(attackers);
//move cards like Phage the Untouchable to the front //move cards like Phage the Untouchable to the front
List<Card> prioritizedAttackers = new ArrayList<>(); Collections.sort(attackers, new Comparator<Card>() {
for (Card attacker : attackers) { @Override
if (attacker.hasSVar("MustBeBlocked")) { public int compare(final Card o1, final Card o2) {
prioritizedAttackers.add(attacker); if (o1.hasSVar("MustBeBlocked") && !o2.hasSVar("MustBeBlocked")) {
return -1;
} else if (!o1.hasSVar("MustBeBlocked") && o2.hasSVar("MustBeBlocked")) {
return 1;
} }
return 0;
} }
attackers.removeAll((Iterable<Card>) prioritizedAttackers); });
attackers.addAll(0, prioritizedAttackers);
return attackers; return attackers;
} }