From 07e4b6c47ef1dbb11943a30121a61f5eacacfcc4 Mon Sep 17 00:00:00 2001 From: Sol Date: Sun, 16 Dec 2012 04:10:10 +0000 Subject: [PATCH] - Fixing Sleight of Hand in Quest mode not allowing a free mulligan --- src/main/java/forge/game/player/HumanPlayer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/forge/game/player/HumanPlayer.java b/src/main/java/forge/game/player/HumanPlayer.java index 37a77619e87..7bfb69acbb7 100644 --- a/src/main/java/forge/game/player/HumanPlayer.java +++ b/src/main/java/forge/game/player/HumanPlayer.java @@ -25,6 +25,7 @@ import forge.Singletons; import forge.card.spellability.SpellAbility; import forge.control.input.Input; import forge.game.GameState; +import forge.game.GameType; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; import forge.gui.match.CMatchUI; @@ -208,7 +209,8 @@ public class HumanPlayer extends Player { public final int doMulligan() { int newHand = super.doMulligan(); final QuestController quest = Singletons.getModel().getQuest(); - if (quest.isLoaded() && quest.getAssets().hasItem(QuestItemType.SLEIGHT) && (getStats().getMulliganCount() == 1)) { + final boolean isQuest = Singletons.getModel().getMatch().getGameType().equals(GameType.Quest); + if (isQuest && quest.getAssets().hasItem(QuestItemType.SLEIGHT) && (getStats().getMulliganCount() == 1)) { drawCard(); newHand++; getStats().notifyOpeningHandSize(newHand);