External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 04:52:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[HOU] Added Imaginary Threats.

Browse source
This commit is contained in:
LevelX2 2017-07-05 07:58:46 +02:00
parent 80fde88cae
commit f5c925d26c
4 changed files with 114 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mage/src/main/java/mage/abilities/effects/common/DontUntapInOpponentsNextUntapStepAllEffect.java
View file

@ -34,7 +34,6 @@ import mage.abilities.effects.ContinuousRuleModifyingEffectImpl;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.PhaseStep;
import mage.constants.TargetController;
import mage.filter.FilterPermanent;
import mage.game.Game;
import mage.game.events.GameEvent;
@ -49,23 +48,23 @@ public class DontUntapInOpponentsNextUntapStepAllEffect extends ContinuousRuleMo
private int validForTurnNum;
//private String targetName;
TargetController targetController;
FilterPermanent filter;
/**
* Attention: This effect won't work with targets controlled by different
* controllers If this is needed, the validForTurnNum has to be saved per
* controller.
*
* @param filter
*/
public DontUntapInOpponentsNextUntapStepAllEffect(FilterPermanent filter) {
super(Duration.Custom, Outcome.Detriment, false, true);
this.filter = filter;
this.filter = filter;
}
public DontUntapInOpponentsNextUntapStepAllEffect(final DontUntapInOpponentsNextUntapStepAllEffect effect) {
super(effect);
this.validForTurnNum = effect.validForTurnNum;
this.targetController = effect.targetController;
this.filter = effect.filter;
}
@ -127,7 +126,8 @@ public class DontUntapInOpponentsNextUntapStepAllEffect extends ContinuousRuleMo
if (controller != null && !game.isOpponent(controller, permanent.getControllerId())) {
return false;
}
if (game.getActivePlayerId().equals(permanent.getControllerId()) && // controller's untap step
if (game.getActivePlayerId().equals(permanent.getControllerId())
&& // controller's untap step
filter.match(permanent, source.getSourceId(), source.getControllerId(), game)) {
return true;
}