Merge branch 'master' into 'master'

Comment out the transitivity test due to lag reasons.

See merge request core-developers/forge!2236
This commit is contained in:
Michael Kamensky
2019-10-13 04:42:16 +00:00

View File

@@ -59,7 +59,6 @@ import forge.item.PaperCard;
import forge.util.Aggregates;
import forge.util.Expressions;
import forge.util.MyRandom;
import forge.util.ComparatorUtil;
import forge.util.collect.FCollectionView;
import io.sentry.Sentry;
import io.sentry.event.BreadcrumbBuilder;
@@ -610,7 +609,7 @@ public class AiController {
ComputerUtilAbility.getAvailableCards(game, player);
List<SpellAbility> all = ComputerUtilAbility.getSpellAbilities(cards, player);
ComparatorUtil.verifyTransitivity(saComparator, all);
//ComparatorUtil.verifyTransitivity(saComparator, all); // FIXME: only use this for testing, it lags too much
Collections.sort(all, saComparator); // put best spells first
for (final SpellAbility sa : ComputerUtilAbility.getOriginalAndAltCostAbilities(all, player)) {
@@ -1574,7 +1573,7 @@ public class AiController {
if (all == null || all.isEmpty())
return null;
ComparatorUtil.verifyTransitivity(saComparator, all);
//ComparatorUtil.verifyTransitivity(saComparator, all); // FIXME: only use this for testing, otherwise it lags too much
Collections.sort(all, saComparator); // put best spells first
for (final SpellAbility sa : ComputerUtilAbility.getOriginalAndAltCostAbilities(all, player)) {