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

minor change to last NPE fix

Browse Source
This commit is contained in:
ArsenalNut
2012-10-14 14:30:34 +00:00
parent 5139033309
commit b9913d4e44
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/forge/card/spellability/SpellPermanent.java
View File

@@ -556,7 +556,7 @@ public class SpellPermanent extends Spell {
continue;
}
final SpellAbility exSA = re.getOverridingAbility();
if (exSA != null) {
if (sa != null) {
exSA.setActivatingPlayer(sa.getActivatingPlayer());
@@ -567,11 +567,12 @@ public class SpellPermanent extends Spell {
else {
throw new InvalidParameterException("Either ai or sa must be not null!");
}
if (exSA.getActivatingPlayer() == null) {
throw new InvalidParameterException("Executing SpellAbility for Replacement Effect has no activating player");
}
}
if (exSA.getActivatingPlayer() == null) {
throw new InvalidParameterException("Executing SpellAbility for Replacement Effect has no activating player");
}
// ETBReplacement uses overriding abilities.
// These checks only work if the Executing SpellAbility is an
// Ability_Sub.