From 28364f97ec58ce6f286f5b8c828bcf0006cf70fe Mon Sep 17 00:00:00 2001 From: Agetian Date: Mon, 21 Jul 2014 07:19:16 +0000 Subject: [PATCH] - A better fix for Scry 1. --- .../src/main/java/forge/player/PlayerControllerHuman.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index 43e8433f85d..3cd06b0166c 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -436,7 +436,8 @@ public class PlayerControllerHuman extends PlayerController { @Override public boolean willPutCardOnTop(Card c) { - Card c1 = Card.fromPaperCard(FModel.getMagicDb().getCommonCards().getCard(c.getName()), null); + PaperCard pc = FModel.getMagicDb().getCommonCards().getCard(c.getName()); + Card c1 = (pc != null ? Card.fromPaperCard(pc, null) : c); return SGuiDialog.confirm(c1, "Where will you put " + c1.getName() + " in your library", new String[]{"Top", "Bottom"}); }