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

added null pointer checks to getDefinedCards and getDefinedPlayers

Browse Source
This commit is contained in:
ArsenalNut
2012-02-10 06:13:44 +00:00
parent 06cacc6ca0
commit d20af6a812
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/forge/card/abilityfactory/AbilityFactory.java
View File

@@ -1731,7 +1731,11 @@ public class AbilityFactory {
else if (defined.equals("Targeted")) { else if (defined.equals("Targeted")) {
final SpellAbility parent = AbilityFactory.findParentsTargetedCard(sa); final SpellAbility parent = AbilityFactory.findParentsTargetedCard(sa);
cards.addAll(parent.getTarget().getTargetCards()); if (parent != null) {
if (parent.getTarget() != null) {
cards.addAll(parent.getTarget().getTargetCards());
}
}
} else if (defined.startsWith("Triggered") && (sa != null)) { } else if (defined.startsWith("Triggered") && (sa != null)) {
final SpellAbility root = sa.getRootSpellAbility(); final SpellAbility root = sa.getRootSpellAbility();
final Object crd = root.getTriggeringObject(defined.substring(9)); final Object crd = root.getTriggeringObject(defined.substring(9));
@@ -1844,7 +1848,11 @@ public class AbilityFactory {
if (defined.equals("Targeted")) { if (defined.equals("Targeted")) {
final SpellAbility parent = AbilityFactory.findParentsTargetedPlayer(sa); final SpellAbility parent = AbilityFactory.findParentsTargetedPlayer(sa);
players.addAll(parent.getTarget().getTargetPlayers()); if (parent != null) {
if (parent.getTarget() != null) {
players.addAll(parent.getTarget().getTargetPlayers());
}
}
/* /*
* Target tgt = sa.getTarget(); SpellAbility parent = sa; * Target tgt = sa.getTarget(); SpellAbility parent = sa;
* *