From 8333a8a2c20d39a35dff3a47742952c4a72ff435 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Sat, 6 Apr 2013 22:41:04 +0000 Subject: [PATCH] fix NPE for replicate cost checks --- src/main/java/forge/game/zone/MagicStack.java | 5 +++-- src/main/java/forge/gui/match/QuestWinLose.java | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/forge/game/zone/MagicStack.java b/src/main/java/forge/game/zone/MagicStack.java index 1bcfe9d1a44..1421d67fdf0 100644 --- a/src/main/java/forge/game/zone/MagicStack.java +++ b/src/main/java/forge/game/zone/MagicStack.java @@ -421,9 +421,10 @@ public class MagicStack extends MyObservable { this.getSourceCard().addReplicateMagnitude(1); } }; - - final Player controller = sp.getSourceCard().getController(); + ability.setActivatingPlayer(controller); + + if (controller.isHuman()) { sa.getSourceCard().addReplicateMagnitude(-1); final Runnable addMagnitude = new Runnable() { diff --git a/src/main/java/forge/gui/match/QuestWinLose.java b/src/main/java/forge/gui/match/QuestWinLose.java index d2d37338f58..2d6bd30b49f 100644 --- a/src/main/java/forge/gui/match/QuestWinLose.java +++ b/src/main/java/forge/gui/match/QuestWinLose.java @@ -47,7 +47,6 @@ import forge.game.player.PlayerOutcome; import forge.game.player.PlayerStatistics; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; -import forge.gui.ListChooser; import forge.gui.SOverlayUtils; import forge.gui.home.quest.CSubmenuChallenges; import forge.gui.home.quest.CSubmenuDuels;