Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

* Fixed PreventDamageByTargetEffect to handle delayed spell damge (fixes #2822).

Browse source
This commit is contained in:
LevelX2 2017-01-30 21:19:17 +01:00
parent 64ff81af75
commit 034ef22468
4 changed files with 81 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Mage/src/main/java/mage/target/TargetSpell.java
View file

@ -44,6 +44,7 @@ import mage.game.stack.StackObject;
public class TargetSpell extends TargetObject {
protected final FilterSpell filter;
private final Set<UUID> sourceIds = new HashSet<>();
public TargetSpell() {
this(1, 1, new FilterSpell());
@ -68,6 +69,7 @@ public class TargetSpell extends TargetObject {
public TargetSpell(final TargetSpell target) {
super(target);
this.filter = target.filter.copy();
this.sourceIds.addAll(target.sourceIds);
}
@Override
@ -134,4 +136,18 @@ public class TargetSpell extends TargetObject {
&& game.getState().getPlayersInRange(sourceControllerId, game).contains(stackObject.getControllerId())
&& filter.match(stackObject, sourceID, sourceControllerId, game);
}
@Override
public void addTarget(UUID id, Ability source, Game game, boolean skipEvent) {
Spell spell = game.getStack().getSpell(id);
if (spell != null) { // remember the original sourceID
sourceIds.add(spell.getSourceId());
}
super.addTarget(id, source, game, skipEvent);
}
public Set<UUID> getSourceIds() {
return sourceIds;
}
}