From f4b6a28829e7e92b6c8c8f83676d2a2c7a259bb5 Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Sat, 7 Jan 2012 14:26:26 +0000
Subject: [PATCH] - "Damrod" now correctly checks his spot play condition.

---
 .../com/gempukku/lotro/cards/set4/gondor/Card4_114.java     | 6 ++++++
 .../src/main/java/com/gempukku/lotro/hall/HallServer.java   | 3 +++
 .../gemp-lotr-web/src/main/webapp/includes/changeLog.html   | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_114.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_114.java
index 21e88b5ba..582f7474d 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_114.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_114.java
@@ -36,6 +36,12 @@ public class Card4_114 extends AbstractCompanion {
         addKeyword(Keyword.RANGER);
     }
 
+    @Override
+    public boolean checkPlayRequirements(String playerId, LotroGame game, PhysicalCard self, int withTwilightRemoved, int twilightModifier, boolean ignoreRoamingPenalty, boolean ignoreCheckingDeadPile) {
+        return super.checkPlayRequirements(playerId, game, self, withTwilightRemoved, twilightModifier, ignoreRoamingPenalty, ignoreCheckingDeadPile)
+                && PlayConditions.canSpot(game, Race.MAN, Keyword.RING_BOUND);
+    }
+
     @Override
     protected List<ActivateCardAction> getExtraInPlayPhaseActions(final String playerId, LotroGame game, final PhysicalCard self) {
         if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self)
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
index be83f0e44..c3aec38ce 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
@@ -232,6 +232,9 @@ public class HallServer extends AbstractServer {
         else
             collection = _collectionDao.getCollectionForPlayer(player, collectionType.getCode());
 
+        if (collection == null)
+            throw new HallException("You don't have cards in the required collection to play in this format");
+
         Map<String, Integer> deckCardCounts = CollectionUtils.getTotalCardCountForDeck(lotroDeck);
         final Map<String, Integer> collectionCardCounts = collection.getAll();
 
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
index 71785eb35..70571334d 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
@@ -1,4 +1,7 @@
 <pre style="font-size:80%">
+<b>7 Jan. 2012</b>
+- "Damrod" now correctly checks his spot play condition.
+
 <b>6 Jan. 2012</b>
 - "Uruk Warrior" now correctly can use it's ability in Maneuver phase, rather than in Shadow phase.