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

- Cleanup and NPE protection in ProtectAI.

Browse Source
This commit is contained in:
Sloth
2014-04-12 07:26:50 +00:00
parent 4861826c9e
commit 850efa69c7
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-ai/src/main/java/forge/ai/ability/ProtectAi.java
View File

@@ -121,7 +121,7 @@ public class ProtectAi extends SpellAbilityAi {
if (ComputerUtil.predictThreatenedObjects(sa.getActivatingPlayer(), sa).contains(c)) {
Card threat = game.getStack().peekAbility().getHostCard();
//check to see if threat has already been countered by resolved protect
if (!c.hasProtectionFrom(threat) && (ProtectAi.toProtectFrom(threat, sa) != null)) {
if (threat != null && !c.hasProtectionFrom(threat) && (ProtectAi.toProtectFrom(threat, sa) != null)) {
return true;
}
}
@@ -131,14 +131,16 @@ public class ProtectAi extends SpellAbilityAi {
//creature is blocking and would be destroyed itself
if (combat.isBlocking(c) && ComputerUtilCombat.blockerWouldBeDestroyed(ai, c, combat)) {
List<Card> threats = combat.getAttackersBlockedBy(c);
return (true && (ProtectAi.toProtectFrom(threats.get(0), sa) != null));
return threats != null && !threats.isEmpty() && ProtectAi.toProtectFrom(threats.get(0), sa) != null;
}
//creature is attacking and would be destroyed itself
if (combat.isAttacking(c) && combat.isBlocked(c) && ComputerUtilCombat.attackerWouldBeDestroyed(ai, c, combat)) {
List<Card> threats = combat.getBlockers(c);
ComputerUtilCard.sortByEvaluateCreature(threats);
return (true && (ProtectAi.toProtectFrom(threats.get(0), sa) != null));
if (threats != null && !threats.isEmpty()) {
ComputerUtilCard.sortByEvaluateCreature(threats);
return ProtectAi.toProtectFrom(threats.get(0), sa) != null;
}
}
}