External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-10 04:42:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Quenchable Fire - Fixed that the delayed triggered effect could not be removed by the special action.

Browse source
This commit is contained in:
LevelX2 2015-06-13 00:18:32 +02:00
parent 002cd21809
commit ad186480a3
3 changed files with 35 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/mage/game/Game.java
View file

@ -253,7 +253,7 @@ public interface Game extends MageItem, Serializable {
Card copyCard(Card cardToCopy, Ability source, UUID newController);
void addTriggeredAbility(TriggeredAbility ability);
void addDelayedTriggeredAbility(DelayedTriggeredAbility delayedAbility);
UUID addDelayedTriggeredAbility(DelayedTriggeredAbility delayedAbility);
void applyEffects();
boolean checkStateAndTriggered();
void playPriority(UUID activePlayerId, boolean resuming);

3
Mage/src/mage/game/GameImpl.java
View file

@ -1383,11 +1383,12 @@ public abstract class GameImpl implements Game, Serializable {
}
@Override
public void addDelayedTriggeredAbility(DelayedTriggeredAbility delayedAbility) {
public UUID addDelayedTriggeredAbility(DelayedTriggeredAbility delayedAbility) {
DelayedTriggeredAbility newAbility = delayedAbility.copy();
newAbility.newId();
newAbility.init(this);
state.addDelayedTriggeredAbility(newAbility);
return newAbility.getId();
}
/**