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

Merge remote-tracking branch 'remotes/core/master' into newBranch

Browse Source 
# Conflicts:
#	forge-ai/src/main/java/forge/ai/AiController.java
This commit is contained in:
Anthony Calosa
2019-10-13 14:40:11 +08:00
parent fee8a9186a 4a7bb4e08e
commit ecbc2f9590
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -610,15 +610,13 @@ 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);
try { try {
Collections.sort(all, saComparator); // put best spells first Collections.sort(all, saComparator); // put best spells first
} }
catch (IllegalArgumentException ex) { catch (IllegalArgumentException ex) {
System.err.println(ex.getMessage()); System.err.println(ex.getMessage());
String assertex = ComparatorUtil.verifyTransitivity(saComparator, all); ComparatorUtil.verifyTransitivity(saComparator, all);
if (!assertex.isEmpty())
Sentry.capture(ex.getMessage() + "\nAssertionError [verifyTransitivity]: " + assertex);
} }
for (final SpellAbility sa : ComputerUtilAbility.getOriginalAndAltCostAbilities(all, player)) { for (final SpellAbility sa : ComputerUtilAbility.getOriginalAndAltCostAbilities(all, player)) {
@@ -1581,14 +1579,13 @@ public class AiController {
private SpellAbility chooseSpellAbilityToPlayFromList(final List<SpellAbility> all, boolean skipCounter) { private SpellAbility chooseSpellAbilityToPlayFromList(final List<SpellAbility> all, boolean skipCounter) {
if (all == null || all.isEmpty()) if (all == null || all.isEmpty())
return null; return null;
try { try {
Collections.sort(all, saComparator); // put best spells first Collections.sort(all, saComparator); // put best spells first
} }
catch (IllegalArgumentException ex) { catch (IllegalArgumentException ex) {
System.err.println(ex.getMessage()); System.err.println(ex.getMessage());
String assertex = ComparatorUtil.verifyTransitivity(saComparator, all); ComparatorUtil.verifyTransitivity(saComparator, all);
if (!assertex.isEmpty())
Sentry.capture(ex.getMessage() + "\nAssertionError [verifyTransitivity]: " + assertex);
} }
for (final SpellAbility sa : ComputerUtilAbility.getOriginalAndAltCostAbilities(all, player)) { for (final SpellAbility sa : ComputerUtilAbility.getOriginalAndAltCostAbilities(all, player)) {