diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/AbstractPreventableCardEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/AbstractPreventableCardEffect.java index 23457c661..0731bc401 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/AbstractPreventableCardEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/AbstractPreventableCardEffect.java @@ -54,6 +54,7 @@ public abstract class AbstractPreventableCardEffect extends AbstractEffect { public void preventEffect(LotroGame game, PhysicalCard card) { _preventedTargets.add(card); + _prevented = true; } public void incrementInstead() { diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractEffect.java index e5826b264..c7896960e 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/AbstractEffect.java @@ -9,6 +9,7 @@ import java.util.Collection; public abstract class AbstractEffect implements Effect { private Boolean _carriedOut; private Boolean _successful; + protected boolean _prevented; protected abstract FullEffectResult playEffectReturningResult(LotroGame game); @@ -23,7 +24,7 @@ public abstract class AbstractEffect implements Effect { public boolean wasCarriedOut() { if (_carriedOut == null) throw new IllegalStateException("Effect has to be played first"); - return _carriedOut; + return _carriedOut && !_prevented; } @Override 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 896024f71..a73b6c5a0 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,6 +1,8 @@
20 Sep. 2012 - "Rallying Call" should now correctly prevent removal of threats by FP cards. +- All of the cost-to-effect actions, when cost was prevented, should now stop the "effect" part, i.e. Corsair Marauder +if the discarding of possession was prevented, will not reinforce token. 12 Sep. 2012 - "Morgul Regiment" and similar cards now trigger only during fierce assignment, only if the minion has Fierce.