Merge branch 'master' into 'master'

Check NetCombatDamage instead of NetPower when testing for possible Trample attack

See merge request core-developers/forge!2989
This commit is contained in:
Michael Kamensky
2020-07-10 12:26:28 +00:00

View File

@@ -1166,7 +1166,7 @@ public class AiAttackController {
}
});
boolean canTrampleOverDefenders = attacker.hasKeyword(Keyword.TRAMPLE) && attacker.getNetPower() > Aggregates.sum(validBlockers, CardPredicates.Accessors.fnGetNetToughness);
boolean canTrampleOverDefenders = attacker.hasKeyword(Keyword.TRAMPLE) && attacker.getNetCombatDamage() > Aggregates.sum(validBlockers, CardPredicates.Accessors.fnGetNetToughness);
// used to check that CanKillAllDangerous check makes sense in context where creatures with dangerous abilities are present
boolean dangerousBlockersPresent = !CardLists.filter(validBlockers, Predicates.or(