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

Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git

Browse Source
This commit is contained in:
Alessandro Coli
2019-10-13 17:58:46 +02:00
parent 25194c7abe 4a7bb4e08e
commit 762481e28a
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -610,8 +610,14 @@ public class AiController {
ComputerUtilAbility.getAvailableCards(game, player); ComputerUtilAbility.getAvailableCards(game, player);
List<SpellAbility> all = ComputerUtilAbility.getSpellAbilities(cards, player); List<SpellAbility> all = ComputerUtilAbility.getSpellAbilities(cards, player);
ComparatorUtil.verifyTransitivity(saComparator, all);
try {
Collections.sort(all, saComparator); // put best spells first Collections.sort(all, saComparator); // put best spells first
}
catch (IllegalArgumentException ex) {
System.err.println(ex.getMessage());
ComparatorUtil.verifyTransitivity(saComparator, all);
}
for (final SpellAbility sa : ComputerUtilAbility.getOriginalAndAltCostAbilities(all, player)) { for (final SpellAbility sa : ComputerUtilAbility.getOriginalAndAltCostAbilities(all, player)) {
ApiType saApi = sa.getApi(); ApiType saApi = sa.getApi();
@@ -1574,8 +1580,13 @@ public class AiController {
if (all == null || all.isEmpty()) if (all == null || all.isEmpty())
return null; return null;
ComparatorUtil.verifyTransitivity(saComparator, all); try {
Collections.sort(all, saComparator); // put best spells first Collections.sort(all, saComparator); // put best spells first
}
catch (IllegalArgumentException ex) {
System.err.println(ex.getMessage());
ComparatorUtil.verifyTransitivity(saComparator, all);
}
for (final SpellAbility sa : ComputerUtilAbility.getOriginalAndAltCostAbilities(all, player)) { for (final SpellAbility sa : ComputerUtilAbility.getOriginalAndAltCostAbilities(all, player)) {
// Don't add Counterspells to the "normal" playcard lookups // Don't add Counterspells to the "normal" playcard lookups