diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_108.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_108.java index 72b26d7d4..3b4d65d29 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_108.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_108.java @@ -65,7 +65,7 @@ public class Card2_108 extends AbstractAttachable { } }); possibleEffects.add( - new CancelRingBearerAndNazgulSkirmish(self) { + new CancelRingBearerAndNazgulSkirmish(self.getAttachedTo()) { @Override public String getText(LotroGame game) { return "Cancel a skirmish"; @@ -81,10 +81,10 @@ public class Card2_108 extends AbstractAttachable { } private class CancelRingBearerAndNazgulSkirmish extends CancelSkirmishEffect { - private PhysicalCard _attachedCondition; + private PhysicalCard _attachedTo; - private CancelRingBearerAndNazgulSkirmish(PhysicalCard attachedCondition) { - _attachedCondition = attachedCondition; + private CancelRingBearerAndNazgulSkirmish(PhysicalCard attachedTo) { + _attachedTo = attachedTo; } @Override @@ -95,7 +95,7 @@ public class Card2_108 extends AbstractAttachable { @Override public boolean isPlayableInFull(LotroGame game) { Skirmish skirmish = game.getGameState().getSkirmish(); - return (skirmish != null && skirmish.getFellowshipCharacter() == _attachedCondition.getAttachedTo() + return (skirmish != null && skirmish.getFellowshipCharacter() == _attachedTo && Filters.filter(skirmish.getShadowCharacters(), game.getGameState(), game.getModifiersQuerying(), Filters.race(Race.NAZGUL)).size() > 0); } } 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 09ec30b86..107be887e 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 @@
+2 Nov. 2011 +- "O Elbereth! Gilthoniel!" should correctly give the option to cancel a skirmish with Nazgul when used in skirmish +against Nazgul. + 1 Nov. 2011 - Fixed "Theoden" (4P365) to not crash game due to testing if you can attach hides (also a possession, right?) to it.