github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-05 17:00:10 -09:00
Code Issues Projects Releases Packages Wiki Activity

* Not of This World - Fixed a possible Null Pointer Exception.

Browse source
This commit is contained in:
LevelX2 2014-07-21 23:43:03 +02:00
parent 8ff7e04e85
commit 7ef232c556
1 changed files with 2 additions and 5 deletions

7
Mage.Sets/src/mage/sets/riseoftheeldrazi/NotOfThisWorld.java
View file

@ -43,7 +43,6 @@ import mage.constants.Zone;
import mage.filter.Filter;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.PowerPredicate;
import static mage.filter.predicate.permanent.ControllerControlsIslandPredicate.filter;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -54,8 +53,6 @@ import mage.target.Target;
import mage.target.TargetObject;
import mage.target.Targets;
/**
*
* @author Rafbill
@ -128,7 +125,7 @@ class TargetSpellTargetingControlledPermanent extends TargetObject {
for (Target target : objectTargets) {
for (UUID targetId : target.getTargets()) {
Permanent targetedPermanent = game.getPermanentOrLKIBattlefield(targetId);
if (targetedPermanent.getControllerId().equals(sourceControllerId)) {
if (targetedPermanent != null && targetedPermanent.getControllerId().equals(sourceControllerId)) {
return true;
}
}
@ -155,7 +152,7 @@ class TargetSpellTargetingControlledPermanent extends TargetObject {
for (Target target : objectTargets) {
for (UUID targetId : target.getTargets()) {
Permanent targetedPermanent = game.getPermanentOrLKIBattlefield(targetId);
if (targetedPermanent.getControllerId().equals(sourceControllerId)) {
if (targetedPermanent != null && targetedPermanent.getControllerId().equals(sourceControllerId)) {
possibleTargets.add(stackObject.getId());
}
}