From b917823b90941a95a0cdfe0a80cb19a753ed1bf9 Mon Sep 17 00:00:00 2001
From: "marcin.sciesinski" <Marcin.Sciesinski@stash.synchronoss.net>
Date: Sat, 11 Nov 2017 13:51:02 -0800
Subject: [PATCH] Fixed "Better Than Nothing"

---
 .../lotro/cards/set31/gollum/Card31_019.java  | 48 ++++++++++---------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gollum/Card31_019.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gollum/Card31_019.java
index 833802234..c2aa3cd71 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gollum/Card31_019.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gollum/Card31_019.java
@@ -29,33 +29,37 @@ public class Card31_019 extends AbstractEvent {
         super(Side.SHADOW, 0, Culture.GOLLUM, "Better Than Nothing", Phase.SHADOW);
     }
 
+    @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.canDiscardFromPlay(self, game, Race.ORC)
+                && PlayConditions.canPlayFromDeck(playerId, game, Filters.name("Gollum"));
+    }
+
     @Override
     public PlayEventAction getPlayCardAction(String playerId, LotroGame game, PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) {
-		PlayEventAction action = new PlayEventAction(self);       
-		if (Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Race.ORC)) {
-			action.appendCost(
-					new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Race.ORC));
-			List<Effect> possibleEffects = new LinkedList<Effect>();
-            possibleEffects.add(
-                    new ChooseAndPlayCardFromDeckEffect(playerId, Filters.gollum) {
-                @Override
-                public String getText(LotroGame game) {
-                    return "Play Gollum from your draw deck";
-                }
-            });
-            if (PlayConditions.canPlayFromDiscard(playerId, game, Filters.gollum)) {
-                possibleEffects.add(
-                        new ChooseAndPlayCardFromDiscardEffect(playerId, game, Filters.gollum) {
+        PlayEventAction action = new PlayEventAction(self);
+        action.appendCost(
+                new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Race.ORC));
+        List<Effect> possibleEffects = new LinkedList<Effect>();
+        possibleEffects.add(
+                new ChooseAndPlayCardFromDeckEffect(playerId, Filters.gollum) {
                     @Override
                     public String getText(LotroGame game) {
-                        return "Play Gollum from your discard pile";
+                        return "Play Gollum from your draw deck";
                     }
                 });
-            }
-            action.appendEffect(
-                    new ChoiceEffect(action, playerId, possibleEffects));
-			return action;
-		}
-		return null;
+        if (PlayConditions.canPlayFromDiscard(playerId, game, Filters.gollum)) {
+            possibleEffects.add(
+                    new ChooseAndPlayCardFromDiscardEffect(playerId, game, Filters.gollum) {
+                        @Override
+                        public String getText(LotroGame game) {
+                            return "Play Gollum from your discard pile";
+                        }
+                    });
+        }
+        action.appendEffect(
+                new ChoiceEffect(action, playerId, possibleEffects));
+        return action;
     }
 }