External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-22 03:09:53 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tamiyo fixes #2078

Browse source
This commit is contained in:
drmDev 2016-07-15 21:15:04 -04:00
parent 966de10386
commit 2ecadbc30b
2 changed files with 35 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Mage.Sets/src/mage/sets/eldritchmoon/TamiyoFieldResearcher.java
View file

@ -143,7 +143,7 @@ class TamiyoFieldResearcherEffect1 extends OneShotEffect {
creatures.add(new MageObjectReference(uuid, game));
}
if (!creatures.isEmpty()) {
DelayedTriggeredAbility delayedAbility = new TamiyoFieldResearcherDelayedTriggeredAbility(creatures);
DelayedTriggeredAbility delayedAbility = new TamiyoFieldResearcherDelayedTriggeredAbility(creatures, game.getTurnNum());
game.addDelayedTriggeredAbility(delayedAbility, source);
}
return true;
@ -153,17 +153,20 @@ class TamiyoFieldResearcherEffect1 extends OneShotEffect {
}
class TamiyoFieldResearcherDelayedTriggeredAbility extends DelayedTriggeredAbility {
private int startingTurn;
private List<MageObjectReference> creatures;
public TamiyoFieldResearcherDelayedTriggeredAbility(List<MageObjectReference> creatures) {
super(new DrawCardSourceControllerEffect(1), Duration.UntilYourNextTurn, false);
public TamiyoFieldResearcherDelayedTriggeredAbility(List<MageObjectReference> creatures, int startingTurn) {
super(new DrawCardSourceControllerEffect(1), Duration.Custom, false);
this.creatures = creatures;
}
this.startingTurn = startingTurn;
}
public TamiyoFieldResearcherDelayedTriggeredAbility(final TamiyoFieldResearcherDelayedTriggeredAbility ability) {
super(ability);
this.creatures = ability.creatures;
this.startingTurn = ability.startingTurn;
}
@Override
@ -181,6 +184,11 @@ class TamiyoFieldResearcherDelayedTriggeredAbility extends DelayedTriggeredAbili
}
return false;
}
@Override
public boolean isInactive(Game game) {
return game.getActivePlayerId().equals(getControllerId()) && game.getTurnNum() != startingTurn;
}
@Override
public TamiyoFieldResearcherDelayedTriggeredAbility copy() {