From e88c60eb85ee1f8ee71be65dd8ca164299f12619 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 31 Oct 2015 10:33:37 +0100 Subject: [PATCH] * Scroll Rack - Fixed that the cards were shown face down if setting the order they go to library. --- Mage.Common/src/mage/remote/SessionImpl.java | 4 +--- Mage.Common/src/mage/view/CardView.java | 2 +- .../src/main/java/mage/server/game/GameController.java | 7 +++++-- Mage.Sets/src/mage/sets/tempest/ScrollRack.java | 7 +------ 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Mage.Common/src/mage/remote/SessionImpl.java b/Mage.Common/src/mage/remote/SessionImpl.java index 8017868ba7..3b4036d4c2 100644 --- a/Mage.Common/src/mage/remote/SessionImpl.java +++ b/Mage.Common/src/mage/remote/SessionImpl.java @@ -468,9 +468,7 @@ public class SessionImpl implements Session { @Override public void handleConnectionException(Throwable throwable, Client client) { - logger.info("connection to server lost - " + throwable.getMessage()); - throwable.printStackTrace(); - + logger.info("connection to server lost - " + throwable.getMessage(), throwable); reconnect(throwable); } } diff --git a/Mage.Common/src/mage/view/CardView.java b/Mage.Common/src/mage/view/CardView.java index 008f6cd0b4..7216ba5c49 100644 --- a/Mage.Common/src/mage/view/CardView.java +++ b/Mage.Common/src/mage/view/CardView.java @@ -153,7 +153,7 @@ public class CardView extends SimpleCardView { * for morph / face down cards to know which player may see information for * the card * @param showFaceDownCard if true and the card is not on the battelfield, - * also a face down card is shown in the view down cards will be shown + * also a face down card is shown in the view, face down cards will be shown */ public CardView(Card card, Game game, boolean controlled, boolean showFaceDownCard) { super(card.getId(), card.getExpansionSetCode(), card.getCardNumber(), card.getUsesVariousArt(), card.getTokenSetCode(), game != null); diff --git a/Mage.Server/src/main/java/mage/server/game/GameController.java b/Mage.Server/src/main/java/mage/server/game/GameController.java index eec4ea0dfe..07a5763a51 100644 --- a/Mage.Server/src/main/java/mage/server/game/GameController.java +++ b/Mage.Server/src/main/java/mage/server/game/GameController.java @@ -825,8 +825,11 @@ public class GameController implements GameCallback { @Override public void execute(UUID playerId) { if (cards != null) { - Zone targetZone = (Zone) options.get("targetZone"); - boolean showFaceDown = targetZone != null && targetZone.equals(Zone.PICK); + // Zone targetZone = (Zone) options.get("targetZone"); + // Are there really situations where a player selects from a list of face down cards? + // So always show face up for selection + // boolean showFaceDown = targetZone != null && targetZone.equals(Zone.PICK); + boolean showFaceDown = true; getGameSession(playerId).target(question, new CardsView(game, cards.getCards(game), showFaceDown), targets, required, options); } else if (perms != null) { CardsView permsView = new CardsView(); diff --git a/Mage.Sets/src/mage/sets/tempest/ScrollRack.java b/Mage.Sets/src/mage/sets/tempest/ScrollRack.java index db4100fe0e..6e792063af 100644 --- a/Mage.Sets/src/mage/sets/tempest/ScrollRack.java +++ b/Mage.Sets/src/mage/sets/tempest/ScrollRack.java @@ -27,7 +27,6 @@ */ package mage.sets.tempest; -import java.util.Set; import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; @@ -111,11 +110,7 @@ class ScrollRackEffect extends OneShotEffect { } // Put that many cards from the top of your library into your hand. if (amountExiled > 0) { - Set cards = controller.getLibrary().getTopCards(game, amountExiled); - for (Card card : cards) { - card.setFaceDown(true, game); - } - controller.moveCards(cards, null, Zone.HAND, source, game); + controller.moveCards(controller.getLibrary().getTopCards(game, amountExiled), Zone.HAND, source, game); } // Then look at the exiled cards and put them on top of your library in any order controller.putCardsOnTopOfLibrary(game.getExile().getExileZone(source.getSourceId()), game, source, true);