github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

- little fixes. #5625

Browse source
This commit is contained in:
Jeff 2019-03-11 08:50:05 -05:00
parent 3fb18b334d
commit c784753ee6
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Mage.Sets/src/mage/cards/d/DereviEmpyrialTactician.java
View file

@ -1,4 +1,3 @@
package mage.cards.d;
import java.util.UUID;
@ -44,6 +43,7 @@ public final class DereviEmpyrialTactician extends CardImpl {
// Flying
this.addAbility(FlyingAbility.getInstance());
// Whenever Derevi, Empyrial Tactician enters the battlefield or a creature you control deals combat damage to a player, you may tap or untap target permanent.
Ability ability = new DereviEmpyrialTacticianTriggeredAbility(new MayTapOrUntapTargetEffect());
ability.addTarget(new TargetPermanent());
@ -75,7 +75,8 @@ class DereviEmpyrialTacticianTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == EventType.ENTERS_THE_BATTLEFIELD || event.getType() == EventType.DAMAGED_PLAYER;
return event.getType() == EventType.ENTERS_THE_BATTLEFIELD
|| event.getType() == EventType.DAMAGED_PLAYER;
}
@Override
@ -87,7 +88,8 @@ class DereviEmpyrialTacticianTriggeredAbility extends TriggeredAbilityImpl {
if (event.getType() == GameEvent.EventType.DAMAGED_PLAYER) {
if (((DamagedPlayerEvent) event).isCombatDamage()) {
Permanent creature = game.getPermanent(event.getSourceId());
if (creature != null && creature.isControlledBy(controllerId)) {
if (creature != null
&& creature.isControlledBy(controllerId)) {
return true;
}
}

2
Mage/src/main/java/mage/abilities/effects/common/MayTapOrUntapTargetEffect.java
View file

@ -14,7 +14,7 @@ import mage.players.Player;
public class MayTapOrUntapTargetEffect extends OneShotEffect {
public MayTapOrUntapTargetEffect() {
super(Outcome.Benefit);
super(Outcome.AIDontUseIt);
}
public MayTapOrUntapTargetEffect(final MayTapOrUntapTargetEffect effect) {