From 4a8414b8c51ec3aec77e24c3290169aa25f3969d Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Sun, 15 Jan 2012 20:13:41 +0000 Subject: [PATCH] - "Hobbit Farmer" and other allies copying site text should now be able to activate the site phase actions. --- .../src/main/java/com/gempukku/lotro/cards/PlayConditions.java | 2 +- .../java/com/gempukku/lotro/cards/set6/site/Card6_120.java | 3 +-- .../gemp-lotr-web/src/main/webapp/includes/changeLog.html | 3 +++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java index 98ad9470c..7a977dd6f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java @@ -88,7 +88,7 @@ public class PlayConditions { } public static boolean canUseSiteDuringPhase(LotroGame game, Phase phase, PhysicalCard self) { - return (phase == null || game.getGameState().getCurrentPhase() == phase) && (game.getGameState().getCurrentSite() == self); + return game.getGameState().getCurrentPhase() == phase; } public static boolean location(LotroGame game, Filterable... filters) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/site/Card6_120.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/site/Card6_120.java index 986c7ebbc..3393e3e17 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/site/Card6_120.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/site/Card6_120.java @@ -33,8 +33,7 @@ public class Card6_120 extends AbstractSite { @Override public List getOptionalBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { - if (PlayConditions.canUseSiteDuringPhase(game, null, self) - && TriggerConditions.isGettingWounded(effect, game, CardType.MINION, Filters.owner(playerId)) + if (TriggerConditions.isGettingWounded(effect, game, CardType.MINION, Filters.owner(playerId)) && PlayConditions.canDiscardFromHand(game, playerId, 2, Filters.any)) { final WoundCharactersEffect woundEffect = (WoundCharactersEffect) effect; Collection woundedCharacters = woundEffect.getAffectedCardsMinusPrevented(game); 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 30cb05c8e..255bf4561 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 @@
+15 Jan. 2012
+- "Hobbit Farmer" and other allies copying site text should now be able to activate the site phase actions. 
+
 14 Jan. 2012
 - "Refuge" now discards companion from hand, rather than condition to heal a companion.
 - "When moves to" actions now happen before twilight for movement is added.