From f35d57b5347eab6d89977e89b3430a81d96372ec Mon Sep 17 00:00:00 2001 From: Sloth Date: Sun, 30 Jun 2013 08:20:10 +0000 Subject: [PATCH] - Fixed NPE in reveal function. --- src/main/java/forge/game/GameAction.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/forge/game/GameAction.java b/src/main/java/forge/game/GameAction.java index 1af4f60d561..80fab949f27 100644 --- a/src/main/java/forge/game/GameAction.java +++ b/src/main/java/forge/game/GameAction.java @@ -1410,7 +1410,10 @@ public class GameAction { } public void reveal(List cards, Player cardOwner, boolean dontRevealToOwner) { - ZoneType zt = cards.isEmpty() ? ZoneType.Hand : game.getZoneOf(cards.get(0)).getZoneType(); + ZoneType zt = ZoneType.Hand; + if (!cards.isEmpty() && game.getZoneOf(cards.get(0)) != null) { + zt = game.getZoneOf(cards.get(0)).getZoneType(); + } reveal(cardOwner + " reveals card from " + zt, cards, zt, cardOwner, dontRevealToOwner); }