From 528e16d3db6fbe4c286aa5788d8960b61137021c Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Thu, 20 Oct 2011 08:31:14 +0000
Subject: [PATCH] - "Hand Axe" can now be discarded during Archery phase to add
 1 to archery.

---
 .../gempukku/lotro/cards/set2/dwarven/Card2_010.java   |  2 +-
 .../timing/processes/GatherPlayableActionsVisitor.java | 10 ++++++++--
 .../src/main/webapp/includes/changeLog.html            |  4 ++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_010.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_010.java
index 6bb920dfb..34a698410 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_010.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_010.java
@@ -43,7 +43,7 @@ public class Card2_010 extends AbstractAttachableFPPossession {
 
     @Override
     protected List<? extends Action> getExtraInPlayPhaseActions(String playerId, LotroGame game, PhysicalCard self) {
-        if (PlayConditions.canPlayCardDuringPhase(game, Phase.ARCHERY, self)) {
+        if (PlayConditions.canUseFPCardDuringPhase(game.getGameState(), Phase.ARCHERY, self)) {
             ActivateCardAction action = new ActivateCardAction(self);
             action.appendCost(
                     new DiscardCardsFromPlayEffect(self, self));
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/GatherPlayableActionsVisitor.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/GatherPlayableActionsVisitor.java
index c312c0b2e..4db6ee0c3 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/GatherPlayableActionsVisitor.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/GatherPlayableActionsVisitor.java
@@ -22,8 +22,14 @@ public class GatherPlayableActionsVisitor extends CompletePhysicalCardVisitor {
     @Override
     protected void doVisitPhysicalCard(PhysicalCard physicalCard) {
         List<? extends Action> list = physicalCard.getBlueprint().getPhaseActions(_playerId, _game, physicalCard);
-        if (list != null)
-            _actions.addAll(list);
+        if (list != null) {
+            for (Action action : list) {
+                if (action != null)
+                    _actions.add(action);
+                else
+                    System.out.println("Null action from: " + physicalCard.getBlueprint().getName());
+            }
+        }
     }
 
     public List<? extends Action> getActions() {
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 f63b72897..c7b50adff 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,8 @@
 <pre style="font-size:80%">
+<b>20 Oct. 2011</b>
+- "The One Ring" should now work correctly if you put it on twice during a turn (move twice).
+- "Hand Axe" can now be discarded during Archery phase to add 1 to archery.
+
 <b>19 Oct. 2011</b>
 - Finished "Battle of Helm's Deep (05)" expansion.
 - Modified the texts of the effects.