From 2c7759c470f23932b71fa75deb942415d4222d96 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Mon, 19 Sep 2011 08:00:17 +0000 Subject: [PATCH] Timetwister was querying Stack from player... had to add, otherwise it would crash --- src/main/java/forge/Player.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/forge/Player.java b/src/main/java/forge/Player.java index 7861824af5d..1276cfe18ef 100644 --- a/src/main/java/forge/Player.java +++ b/src/main/java/forge/Player.java @@ -876,7 +876,8 @@ public abstract class Player extends GameEntity { * @param player a {@link forge.Player} object. */ public CardList getCardsIn(final Constant.Zone zone) { - return new CardList(getZone(zone).getCards()); + Card[] cards = zone == Zone.Stack ? AllZone.getStackZone().getCards() : getZone(zone).getCards(); + return new CardList(cards); } /**