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

- Fixed possible NPE's caused by Haunt.

Browse Source
This commit is contained in:
Sloth
2013-04-14 21:47:26 +00:00
parent 0a656dc1da
commit 56c2bff69f
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/forge/card/cardfactory/CardFactoryUtil.java
View File

@@ -2958,6 +2958,7 @@ public class CardFactoryUtil {
final Ability haunterDiesSetup = new Ability(card, ManaCost.ZERO) { final Ability haunterDiesSetup = new Ability(card, ManaCost.ZERO) {
@Override @Override
public void resolve() { public void resolve() {
this.setActivatingPlayer(card.getController());
final List<Card> creats = CardLists.filter(Singletons.getModel().getGame().getCardsIn(ZoneType.Battlefield), Presets.CREATURES); final List<Card> creats = CardLists.filter(Singletons.getModel().getGame().getCardsIn(ZoneType.Battlefield), Presets.CREATURES);
for (int i = 0; i < creats.size(); i++) { for (int i = 0; i < creats.size(); i++) {
if (!creats.get(i).canBeTargetedBy(this)) { if (!creats.get(i).canBeTargetedBy(this)) {

1
src/main/java/forge/game/zone/MagicStack.java
View File

@@ -633,6 +633,7 @@ public class MagicStack extends MyObservable {
} }
}; };
for (int i = 0; i < creats.size(); i++) { for (int i = 0; i < creats.size(); i++) {
haunterDiesWork.setActivatingPlayer(sa.getActivatingPlayer());
if (!creats.get(i).canBeTargetedBy(haunterDiesWork)) { if (!creats.get(i).canBeTargetedBy(haunterDiesWork)) {
creats.remove(i); creats.remove(i);
i--; i--;