From 8d51ec7599110d3d7e1759bc9134ae8c42002602 Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Mon, 13 Nov 2017 16:06:24 -0800 Subject: [PATCH] - "Gwaihir" no longer crashed the game, when it is not attached to anything and has its Skirmish action activated. --- .../src/main/web/includes/changeLog.html | 3 +- .../lotro/cards/set31/gandalf/Card31_015.java | 28 +++++++++---------- 2 files changed, 15 insertions(+), 16 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 11cbc7dda..efed2b096 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 @@ -30,7 +30,8 @@ - Added "Forest River" - Added "Thrór's Throne" - Added "The Arkenstone, King's Jewel" - +- "Gwaihir" no longer crashed the game, when it is not attached to anything and has its Skirmish action activated. + 17 Dec. 2015 - "Armor of Khazad" no longer allows to return itself from discard and can now be transferred. diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_015.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_015.java index f7d397448..02fa66234 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_015.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_015.java @@ -19,7 +19,7 @@ import com.gempukku.lotro.logic.timing.EffectResult; import java.util.Collections; import java.util.List; - /** +/** * Set: The Short Rest * Side: Free * Culture: Gandalf @@ -33,15 +33,15 @@ public class Card31_015 extends AbstractFollower { public Card31_015() { super(Side.FREE_PEOPLE, 1, 1, 0, 0, Culture.GANDALF, "Gwaihir", "Lord of the Eagles", true); } - + @Override public Race getRace() { - return Race.EAGLE; + return Race.EAGLE; } - + @Override protected boolean canPayAidCost(LotroGame game, PhysicalCard self) { - return (PlayConditions.canDiscardFromHand(game, self.getOwner(), 1, Culture.GANDALF)); + return (PlayConditions.canDiscardFromHand(game, self.getOwner(), 1, Culture.GANDALF)); } @Override @@ -51,16 +51,14 @@ public class Card31_015 extends AbstractFollower { @Override protected List getExtraPhaseActions(final String playerId, LotroGame game, final PhysicalCard self) { - if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self)) { - final ActivateCardAction action = new ActivateCardAction(self); - PhysicalCard bearer = self.getAttachedTo(); - action.appendCost(new TransferToSupportEffect(self)); - if (Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), bearer, Filters.inSkirmish) - && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.and(Race.ORC, Filters.mounted), Filters.inSkirmish)) { - action.appendEffect(new CancelSkirmishEffect(bearer)); - return Collections.singletonList(action); - } - } + if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self) + && self.getAttachedTo() != null) { + final ActivateCardAction action = new ActivateCardAction(self); + PhysicalCard bearer = self.getAttachedTo(); + action.appendCost(new TransferToSupportEffect(self)); + action.appendEffect(new CancelSkirmishEffect(bearer, Filters.inSkirmishAgainst(Race.ORC, Filters.mounted))); + return Collections.singletonList(action); + } return null; } }