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

Merge branch 'master' into 'master'

Browse Source 
Code simplification/cleanup.

See merge request core-developers/forge!1223
This commit is contained in:
Michael Kamensky
2018-12-13 19:10:59 +00:00
parent a9e3a2d927 ad5ece5242
commit fb6e4be3e2
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java
View File

@@ -1067,14 +1067,6 @@ public class DamageDealAi extends DamageAiBase {
// Ensure that the chained spell can target at least the same things (or more) as the current one // Ensure that the chained spell can target at least the same things (or more) as the current one
TargetRestrictions tgtSa = sa.getTargetRestrictions(); TargetRestrictions tgtSa = sa.getTargetRestrictions();
TargetRestrictions tgtAb = sa.getTargetRestrictions(); TargetRestrictions tgtAb = sa.getTargetRestrictions();
if (tgtSa.canTgtCreature() && !tgtAb.canTgtCreature()) {
continue;
} else if (tgtSa.canTgtPlaneswalker() && !tgtAb.canTgtPlaneswalker()) {
continue;
}
// Check that "ab" has a ValidTgts specification that includes everything "sa" includes, or
// the AI can misplay
String[] validTgtsSa = tgtSa.getValidTgts(); String[] validTgtsSa = tgtSa.getValidTgts();
String[] validTgtsAb = tgtAb.getValidTgts(); String[] validTgtsAb = tgtAb.getValidTgts();
if (!Arrays.asList(validTgtsSa).containsAll(Arrays.asList(validTgtsAb))) { if (!Arrays.asList(validTgtsSa).containsAll(Arrays.asList(validTgtsAb))) {