From ad4174a756b07c69415cd28405d81100c139e5ac Mon Sep 17 00:00:00 2001 From: marcins78 Date: Mon, 28 Jan 2013 09:58:51 +0000 Subject: [PATCH] - "Home and Hearth" no longer triggers off Hobbits played by Shadow player. --- gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html | 3 +++ .../java/com/gempukku/lotro/cards/set1/dwarven/Card1_016.java | 3 ++- .../java/com/gempukku/lotro/cards/set1/elven/Card1_043.java | 3 ++- .../java/com/gempukku/lotro/cards/set12/shire/Card12_122.java | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html index f921f1ea4..1a3e6fdd9 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html @@ -1,4 +1,7 @@
+28 Jan. 2013
+- "Home and Hearth" no longer triggers off Hobbits played by Shadow player.
+
 21 Jan. 2013
 - "Shapes Slowly Advancing" corrupts Ring-bearer whenever there are 4 tokens on the condition, even if the last token
 was added by Reinforcing it.
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_016.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_016.java
index 5d35cb4e8..cd49149e9 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_016.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_016.java
@@ -7,6 +7,7 @@ import com.gempukku.lotro.cards.actions.PlayPermanentAction;
 import com.gempukku.lotro.cards.effects.DiscardTopCardFromDeckEffect;
 import com.gempukku.lotro.cards.effects.choose.ChooseAndExertCharactersEffect;
 import com.gempukku.lotro.common.*;
+import com.gempukku.lotro.filters.Filters;
 import com.gempukku.lotro.game.PhysicalCard;
 import com.gempukku.lotro.game.state.LotroGame;
 import com.gempukku.lotro.logic.actions.RequiredTriggerAction;
@@ -47,7 +48,7 @@ public class Card1_016 extends AbstractPermanent {
 
     @Override
     public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) {
-        if (TriggerConditions.played(game, effectResult, Race.ORC)) {
+        if (TriggerConditions.played(game, effectResult, Filters.not(Filters.owner(self.getOwner())), Race.ORC)) {
             String playerId = ((PlayCardResult) effectResult).getPlayedCard().getOwner();
             RequiredTriggerAction action = new RequiredTriggerAction(self);
             action.appendEffect(new DiscardTopCardFromDeckEffect(self, playerId, true));
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_043.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_043.java
index e56e98e84..96472a0cb 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_043.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_043.java
@@ -4,6 +4,7 @@ import com.gempukku.lotro.cards.AbstractPermanent;
 import com.gempukku.lotro.cards.TriggerConditions;
 import com.gempukku.lotro.cards.effects.choose.ChooseOpponentEffect;
 import com.gempukku.lotro.common.*;
+import com.gempukku.lotro.filters.Filters;
 import com.gempukku.lotro.game.PhysicalCard;
 import com.gempukku.lotro.game.state.LotroGame;
 import com.gempukku.lotro.logic.actions.RequiredTriggerAction;
@@ -28,7 +29,7 @@ public class Card1_043 extends AbstractPermanent {
 
     @Override
     public List getRequiredAfterTriggers(final LotroGame game, EffectResult effectResult, PhysicalCard self) {
-        if (TriggerConditions.played(game, effectResult, Race.ELF)) {
+        if (TriggerConditions.played(game, effectResult, Filters.owner(self.getOwner()), Race.ELF)) {
             final RequiredTriggerAction action = new RequiredTriggerAction(self);
             action.appendEffect(
                     new ChooseOpponentEffect(self.getOwner()) {
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/shire/Card12_122.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/shire/Card12_122.java
index 04627565c..e9c0ccb23 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/shire/Card12_122.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/shire/Card12_122.java
@@ -31,7 +31,7 @@ public class Card12_122 extends AbstractPermanent {
 
     @Override
     public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) {
-        if (TriggerConditions.played(game, effectResult, Race.HOBBIT)) {
+        if (TriggerConditions.played(game, effectResult, Filters.owner(playerId), Race.HOBBIT)) {
             OptionalTriggerAction action = new OptionalTriggerAction(self);
             action.appendEffect(
                     new RemoveBurdenEffect(playerId, self, 1));