From 7c334b51b18b7c9cf5d760989865ed223bb8f36a Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Sat, 16 Mar 2013 22:05:59 +0000
Subject: [PATCH] minor - remove unused methods, quest controllers uses
 lobbyPlayer to detect human playing quest one discard(int, sa) call less
 (inlined in AiInputCommon)

---
 src/main/java/forge/game/ai/AiInputCommon.java |  8 ++++++--
 src/main/java/forge/game/player/Player.java    | 16 +---------------
 src/main/java/forge/quest/QuestController.java |  4 ++--
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/main/java/forge/game/ai/AiInputCommon.java b/src/main/java/forge/game/ai/AiInputCommon.java
index 5276194e4f0..9a2c80a5880 100644
--- a/src/main/java/forge/game/ai/AiInputCommon.java
+++ b/src/main/java/forge/game/ai/AiInputCommon.java
@@ -87,8 +87,12 @@ public class AiInputCommon extends Input {
                         final int size = player.getCardsIn(ZoneType.Hand).size();
                         
                         if (!player.isUnlimitedHandSize()) {
-                            final int numDiscards = size - player.getMaxHandSize();
-                            player.discard(numDiscards, null);
+
+                            int max = Math.min(player.getZone(ZoneType.Hand).size(), size - player.getMaxHandSize());
+                            final List<Card> toDiscard = player.getAi().getCardsToDiscard(max, (String[])null, null);
+                            for (int i = 0; i < toDiscard.size(); i++) {
+                                player.discard(toDiscard.get(i), null);
+                            }
                         }
                     }
                     break;
diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java
index db24f27d9ef..e126dda9cb9 100644
--- a/src/main/java/forge/game/player/Player.java
+++ b/src/main/java/forge/game/player/Player.java
@@ -1687,18 +1687,6 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
         return list;
     }
 
-    /**
-     * <p>
-     * discardRandom.
-     * </p>
-     * 
-     * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
-     * @return a List<Card> of cards discarded
-     */
-    public final List<Card> discardRandom(final SpellAbility sa) {
-        return this.discardRandom(1, sa);
-    }
 
     /**
      * <p>
@@ -1910,9 +1898,7 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
         }
 
         // Dev Mode
-        if (Singletons.getModel().getPreferences().getPrefBoolean(FPref.DEV_UNLIMITED_LAND)
-                && this.isHuman()
-                && Preferences.DEV_MODE) {
+        if (Singletons.getModel().getPreferences().getPrefBoolean(FPref.DEV_UNLIMITED_LAND) && this.getType() == PlayerType.HUMAN && Preferences.DEV_MODE) {
             return true;
         }
 
diff --git a/src/main/java/forge/quest/QuestController.java b/src/main/java/forge/quest/QuestController.java
index 67a07172f62..0b07bb1f0d4 100644
--- a/src/main/java/forge/quest/QuestController.java
+++ b/src/main/java/forge/quest/QuestController.java
@@ -29,7 +29,6 @@ import forge.quest.data.GameFormatQuest;
 import forge.game.GameFormat;
 import forge.game.event.Event;
 import forge.game.event.MulliganEvent;
-import forge.game.player.PlayerType;
 import forge.item.CardPrinted;
 import forge.item.PreconDeck;
 import forge.properties.ForgeProps;
@@ -446,7 +445,8 @@ public class QuestController {
         if ( ev instanceof MulliganEvent ) {
             MulliganEvent mev = (MulliganEvent)ev;
             // First mulligan is free
-            if (mev.player.getType() == PlayerType.HUMAN && getAssets().hasItem(QuestItemType.SLEIGHT) && mev.player.getStats().getMulliganCount() == 0) {
+            if (mev.player.getLobbyPlayer() == Singletons.getControl().getLobby().getQuestPlayer() 
+                    && getAssets().hasItem(QuestItemType.SLEIGHT) && mev.player.getStats().getMulliganCount() == 0) {
                 mev.player.drawCard();
             }
         }