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

Some cleanup and minor rework.

Browse source
This commit is contained in:
LevelX2 2016-01-18 08:18:17 +01:00
parent 2985fb8af1
commit f3154fab54
89 changed files with 358 additions and 569 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mage/src/main/java/mage/game/GameImpl.java
View file

@ -1495,9 +1495,17 @@ public abstract class GameImpl implements Game, Serializable {
delayedAbility.setSourceId(source.getSourceId());
delayedAbility.setControllerId(source.getControllerId());
delayedAbility.setSourceObject(source.getSourceObject(this), this);
return addDelayedTriggeredAbility(delayedAbility);
// return addDelayedTriggeredAbility(delayedAbility);
DelayedTriggeredAbility newAbility = delayedAbility.copy();
newAbility.newId();
// ability.init is called as the ability triggeres not now.
// If a FixedTarget pointer is already set from the effect setting up this delayed ability
// it has to be already initialized so it won't be overwitten as the ability triggers
state.addDelayedTriggeredAbility(newAbility);
return newAbility.getId();
}
@Deprecated
@Override
public UUID addDelayedTriggeredAbility(DelayedTriggeredAbility delayedAbility) {
DelayedTriggeredAbility newAbility = delayedAbility.copy();