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 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 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 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 @@
+20 Oct. 2011
+- "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.
+
 19 Oct. 2011
 - Finished "Battle of Helm's Deep (05)" expansion.
 - Modified the texts of the effects.