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

Fixed that it only is triggered by creatures.

Browse source
This commit is contained in:
LevelX2 2013-03-09 18:38:29 +01:00
parent f457817a05
commit da289a7f67
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Mage/src/mage/abilities/common/BecomesTappedCreatureControlledTriggeredAbility.java
View file

@ -5,10 +5,12 @@
package mage.abilities.common;
import mage.Constants;
import mage.Constants.CardType;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
/**
*
@ -31,8 +33,12 @@ public class BecomesTappedCreatureControlledTriggeredAbility extends TriggeredAb
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.TAPPED && game.getPermanent(event.getTargetId()).getControllerId().equals(this.controllerId)) {
return true;
if (event.getType() == GameEvent.EventType.TAPPED) {
Permanent permanent = game.getPermanent(event.getTargetId());
if (permanent != null && permanent.getControllerId().equals(this.controllerId)
&& permanent.getCardType().contains(CardType.CREATURE)) {
return true;
}
}
return false;
}
@ -40,6 +46,5 @@ public class BecomesTappedCreatureControlledTriggeredAbility extends TriggeredAb
@Override
public String getRule() {
return "When a creature you control becomes tapped, " + super.getRule();
}
}
}