From 47cf2040f69d239ba4ec00e18cf7f190eee8c314 Mon Sep 17 00:00:00 2001 From: Hanmac Date: Fri, 20 Apr 2018 13:03:35 +0200 Subject: [PATCH] PlayerControllerHuman: chooseCardName need to respect face name --- .../src/main/java/forge/player/PlayerControllerHuman.java | 4 +++- 1 file changed, 3 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 47255337d33..b58c0e1eaae 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -1710,8 +1710,10 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont final PaperCard cp = FModel.getMagicDb().getCommonCards().getCard(cardFace.getName()); // the Card instance for test needs a game to be tested final Card instanceForPlayer = Card.fromPaperCard(cp, player); + // TODO need the valid check be done against the CardFace? if (instanceForPlayer.isValid(valid, sa.getHostCard().getController(), sa.getHostCard(), sa)) { - return cp.getName(); + // it need to return name for card face + return cardFace.getName(); } } }