From 057fc34110b0f05b7c2f63799a8f01bd947c0e23 Mon Sep 17 00:00:00 2001 From: Sloth Date: Sat, 18 Apr 2015 11:07:29 +0000 Subject: [PATCH] - Fixed NPE caused by Sidisi, Brood Tyrant (but it still won't work correctly with some effects). --- .../src/main/java/forge/game/trigger/TriggerChangesZone.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java index c61db5f2b6b..7cad2a61bff 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java @@ -138,7 +138,7 @@ public class TriggerChangesZone extends Trigger { // card, rather than keeping track of the host card itself - but it's good enough for now - since there are // no cards with multiple different OncePerEffect triggers. SpellAbilityStackInstance si = (SpellAbilityStackInstance) runParams2.get("SpellAbilityStackInstance"); - return si.attemptOncePerEffectTrigger(this.getHostCard()); + return si != null && si.attemptOncePerEffectTrigger(this.getHostCard()); } return true;