From aee6c58848a2fee944ef34b0766424a22821618e Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Wed, 16 Nov 2011 12:04:58 +0000 Subject: [PATCH] Only owner of cards should get triggers from their cards. --- .../com/gempukku/lotro/cards/set8/wraith/Card8_073.java | 3 ++- .../gempukku/lotro/logic/timing/rules/KilledCardRule.java | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/wraith/Card8_073.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/wraith/Card8_073.java index ce5a7dbe3..2c1bf8b8f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/wraith/Card8_073.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/wraith/Card8_073.java @@ -47,7 +47,8 @@ public class Card8_073 extends AbstractEvent { new AbstractActionProxy() { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult) { - if (PlayConditions.winsSkirmish(game, effectResult, card)) { + if (PlayConditions.winsSkirmish(game, effectResult, card) + && playerId.equals(card.getOwner())) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.setActionAttachedToCard(card); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/KilledCardRule.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/KilledCardRule.java index 75b89dfae..27c37cf9b 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/KilledCardRule.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/KilledCardRule.java @@ -30,9 +30,11 @@ public class KilledCardRule { Set killedCards = killResult.getKilledCards(); List actions = new LinkedList(); for (PhysicalCard killedCard : killedCards) { - OptionalTriggerAction trigger = killedCard.getBlueprint().getKilledOptionalTrigger(game, killedCard); - if (trigger != null) - actions.add(trigger); + if (killedCard.getOwner().equals(playerId)) { + OptionalTriggerAction trigger = killedCard.getBlueprint().getKilledOptionalTrigger(game, killedCard); + if (trigger != null) + actions.add(trigger); + } } return actions; }