From a3f757f26aa01f3252fa8b08afa5f783b7a04ebb Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Tue, 1 Dec 2020 11:14:22 +0100 Subject: [PATCH] CardView: fix facedown view on mindSlave=Controller --- forge-game/src/main/java/forge/game/card/CardView.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/CardView.java b/forge-game/src/main/java/forge/game/card/CardView.java index 1ebbda591b5..16c7ab0210d 100644 --- a/forge-game/src/main/java/forge/game/card/CardView.java +++ b/forge-game/src/main/java/forge/game/card/CardView.java @@ -472,13 +472,13 @@ public class CardView extends GameEntityView { if (mayPlayerLook(viewer)) { return true; } - + final PlayerView controller = getController(); //if viewer is controlled by another player, also check if face can be shown to that player final PlayerView mindSlaveMaster = viewer.getMindSlaveMaster(); - if (mindSlaveMaster != null && canFaceDownBeShownTo(mindSlaveMaster)) { + if (mindSlaveMaster != null && mindSlaveMaster != controller && canFaceDownBeShownTo(mindSlaveMaster)) { return true; } - return isInZone(EnumSet.of(ZoneType.Battlefield, ZoneType.Stack, ZoneType.Sideboard)) && getController().equals(viewer); + return isInZone(EnumSet.of(ZoneType.Battlefield, ZoneType.Stack, ZoneType.Sideboard)) && controller.equals(viewer); } public FCollectionView getEncodedCards() {