From 16da11a8281a4b51bf8a70b4bc7b7e1b72bc25c3 Mon Sep 17 00:00:00 2001 From: Agetian Date: Thu, 8 Oct 2015 20:06:12 +0000 Subject: [PATCH] - NPE protection. --- forge-game/src/main/java/forge/game/GameAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java index e4bde929f7a..0dd8c2219e8 100644 --- a/forge-game/src/main/java/forge/game/GameAction.java +++ b/forge-game/src/main/java/forge/game/GameAction.java @@ -311,7 +311,7 @@ public class GameAction { } // rule 504.6: reveal a face-down card leaving the stack - if (zoneFrom.is(ZoneType.Stack) && !zoneTo.is(ZoneType.Battlefield) && c.isFaceDown()) { + if (zoneFrom != null && zoneTo != null && zoneFrom.is(ZoneType.Stack) && !zoneTo.is(ZoneType.Battlefield) && c.isFaceDown()) { c.setState(CardStateName.Original, true); reveal(new CardCollection(c), c.getOwner(), true, "Face-down card moves from the stack: "); c.setState(CardStateName.FaceDown, true);