Fixed source damage prevention not working properly.

Tested for Burrenton Forge-Tender.
This commit is contained in:
Nathaniel Brandes 2015-05-04 02:09:43 -07:00
parent ddc2128f78
commit efb48e2ace

View file

@ -31,12 +31,14 @@ import mage.MageObject;
import mage.MageObjectReference; import mage.MageObjectReference;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.effects.PreventionEffectImpl; import mage.abilities.effects.PreventionEffectImpl;
import mage.cards.Card;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.filter.FilterObject; import mage.filter.FilterObject;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.target.TargetSource; import mage.target.TargetSource;
import mage.target.targetpointer.FixedTarget;
/** /**
* *
@ -65,7 +67,6 @@ public class PreventDamageBySourceEffect extends PreventionEffectImpl {
public PreventDamageBySourceEffect(final PreventDamageBySourceEffect effect) { public PreventDamageBySourceEffect(final PreventDamageBySourceEffect effect) {
super(effect); super(effect);
this.target = effect.target.copy(); this.target = effect.target.copy();
this.mageObjectReference = effect.mageObjectReference;
} }
@Override @Override
@ -76,15 +77,15 @@ public class PreventDamageBySourceEffect extends PreventionEffectImpl {
@Override @Override
public void init(Ability source, Game game) { public void init(Ability source, Game game) {
this.target.choose(Outcome.PreventDamage, source.getControllerId(), source.getSourceId(), game); this.target.choose(Outcome.PreventDamage, source.getControllerId(), source.getSourceId(), game);
mageObjectReference = new MageObjectReference(target.getFirstTarget(), game); setTargetPointer(new FixedTarget(target.getFirstTarget()));
} }
@Override @Override
public boolean applies(GameEvent event, Ability source, Game game) { public boolean applies(GameEvent event, Ability source, Game game) {
if (super.applies(event, source, game)) { if (super.applies(event, source, game)) {
MageObject mageObject = game.getObject(event.getSourceId()); Card card = game.getCard(((FixedTarget)getTargetPointer()).getTarget());
if (mageObject != null && mageObjectReference.refersTo(mageObject, game)) { if(card != null) {
return true; return card.getId().equals(event.getSourceId());
} }
} }
return false; return false;