From f04a47b15ef70c95d3f6e191057f49b8c96f65e6 Mon Sep 17 00:00:00 2001 From: drdev Date: Fri, 3 Oct 2014 09:41:22 +0000 Subject: [PATCH] Fix bug where details for some cards were not being shown when tutoring --- forge-gui/src/main/java/forge/view/LocalGameView.java | 9 +++------ forge-gui/src/main/java/forge/view/ViewUtil.java | 2 -- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/forge-gui/src/main/java/forge/view/LocalGameView.java b/forge-gui/src/main/java/forge/view/LocalGameView.java index 3c802938c7e..c6f82b045cd 100644 --- a/forge-gui/src/main/java/forge/view/LocalGameView.java +++ b/forge-gui/src/main/java/forge/view/LocalGameView.java @@ -452,13 +452,10 @@ public abstract class LocalGameView implements IGameView { } private void writeCardToView(final Card c, final CardView view, final LocalGameView gameView) { - // First, write the values independent of other views. - boolean mayShowCard = gameView.mayShowCard(c); - ViewUtil.writeNonDependentCardViewProperties(c, view, mayShowCard, gameView.mayShowCardFace(c)); - - // Next, write the values that depend on other views if card can be shown - if (!mayShowCard) { return; } + // First, write the values independent of other views + ViewUtil.writeNonDependentCardViewProperties(c, view, gameView.mayShowCard(c), gameView.mayShowCardFace(c)); + // Next, write the values that depend on other views final Combat combat = game.getCombat(); view.setOwner(getPlayerView(c.getOwner(), false)); view.setController(getPlayerView(c.getController(), false)); diff --git a/forge-gui/src/main/java/forge/view/ViewUtil.java b/forge-gui/src/main/java/forge/view/ViewUtil.java index cc64a4d8b47..421e247445f 100644 --- a/forge-gui/src/main/java/forge/view/ViewUtil.java +++ b/forge-gui/src/main/java/forge/view/ViewUtil.java @@ -38,8 +38,6 @@ public final class ViewUtil { view.setMayBeShown(mayShowCard); view.setZone(c.getZone() == null ? null : c.getZone().getZoneType()); view.setHasAltState(hasAltState); - if (!mayShowCard) { return; } //remaining properties aren't needed if card can't be shown - view.setFaceDown(c.isFaceDown()); view.setCloned(c.isCloned()); view.setFlipCard(c.isFlipCard());