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

- NPE prevention in ControlGainAi.

Browse Source
This commit is contained in:
Agetian
2017-09-13 16:41:10 +00:00
parent 37ebb5731d
commit 452bdd7b4f
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/ability/ControlGainAi.java
View File

@@ -227,6 +227,7 @@ public class ControlGainAi extends SpellAbilityAi {
t = ComputerUtilCard.getMostExpensivePermanentAI(list, sa, true); t = ComputerUtilCard.getMostExpensivePermanentAI(list, sa, true);
} }
if (t != null) {
if (t.isCreature()) if (t.isCreature())
creatures--; creatures--;
if (t.isPlaneswalker()) if (t.isPlaneswalker())
@@ -237,6 +238,7 @@ public class ControlGainAi extends SpellAbilityAi {
artifacts--; artifacts--;
if (t.isEnchantment()) if (t.isEnchantment())
enchantments--; enchantments--;
}
if (!sa.canTarget(t)) { if (!sa.canTarget(t)) {
list.remove(t); list.remove(t);

4
forge-game/src/main/java/forge/game/spellability/SpellAbility.java
View File

@@ -889,6 +889,10 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
} }
public final boolean canTarget(final GameObject entity) { public final boolean canTarget(final GameObject entity) {
if (entity == null) {
return false;
}
final TargetRestrictions tr = getTargetRestrictions(); final TargetRestrictions tr = getTargetRestrictions();
// Restriction related to this ability // Restriction related to this ability